From 2a075b7d87384cbdfd2c17dcddd732707c59e310 Mon Sep 17 00:00:00 2001 From: mzz2017 Date: Sat, 19 Dec 2020 22:55:30 +0800 Subject: [PATCH] chore(aur): v2raya-git --- gui/src/assets/js/utils.js | 5 ++++- install/aur/v2raya/PKGBUILD | 2 +- service/common/tools.go | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gui/src/assets/js/utils.js b/gui/src/assets/js/utils.js index 99158a84..cbcb869b 100644 --- a/gui/src/assets/js/utils.js +++ b/gui/src/assets/js/utils.js @@ -219,9 +219,12 @@ function isIntranet(url) { } function isVersionGreaterEqual(va, vb) { - if (va.toLowerCase() === "debug") { + if (va === "debug" || va === "unstable") { return true; } + if (vb === "debug" || vb === "unstable") { + return false; + } va = va.trim(); vb = vb.trim(); if (va.length > 0 && va[0] === "v") { diff --git a/install/aur/v2raya/PKGBUILD b/install/aur/v2raya/PKGBUILD index bb4b1bd7..ae87c82f 100644 --- a/install/aur/v2raya/PKGBUILD +++ b/install/aur/v2raya/PKGBUILD @@ -23,7 +23,7 @@ build() { cd "$srcdir/v2rayA-$pkgver/service" export GO111MODULE=on export GOPROXY=https://goproxy.io - CGO_ENABLED=0 go build -ldflags '-X github.com/v2rayA/v2rayA/global.Version=$pkgver -s -w -extldflags "-static"' -o v2raya + CGO_ENABLED=0 go build -ldflags '-X github.com/v2rayA/v2rayA/global.Version='$pkgver' -s -w -extldflags "-static"' -o v2raya } package() { diff --git a/service/common/tools.go b/service/common/tools.go index 303cfcd5..85312892 100644 --- a/service/common/tools.go +++ b/service/common/tools.go @@ -49,10 +49,10 @@ func VersionMustGreaterEqual(v1, v2 string) (is bool) { /* return if v1 is after v2 */ func VersionGreaterEqual(v1, v2 string) (is bool, err error) { - if v1 == "debug" { + if v1 == "debug" || v1 == "unstable" { return true, nil } - if v2 == "debug" { + if v2 == "debug" || v2 == "unstable" { return false, nil } v1 = strings.TrimPrefix(v1, "v")