fix errors

2 files changed, 16 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de2b64093319..38494e428837 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tiny-rdm
 	pkgdesc = A modern lightweight cross-platform Redis desktop manager
 	pkgver = 1.1.9
-	pkgrel = 1
+	pkgrel = 2
 	url = https://redis.tinycraft.cc/
 	arch = any
 	license = GPL-3.0-only
diff --git a/PKGBUILD b/PKGBUILD
index 6670e82399c6..6685411ef6c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=tiny-rdm
 _pkgname="Tiny RDM"
 pkgver=1.1.9
 _nodeversion=18
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern lightweight cross-platform Redis desktop manager"
 arch=('any')
 url="https://redis.tinycraft.cc/"
@@ -39,16 +39,24 @@ build() {
     cd "${srcdir}/${pkgname}.git"
     export npm_config_build_from_source=true
     export npm_config_cache="${srcdir}/.npm_cache"
-    export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-    export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
-    export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
-    export ELECTRONVERSION="${_electronversion}"
+    #export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+    #export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    #export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
+    #export ELECTRONVERSION="${_electronversion}"
     export npm_config_disturl=https://electronjs.org/headers
-    npm install --prefix ./frontend
+    HOME="${srcdir}/.electron-gyp"
     export CGO_ENABLED=1
     export GOCACHE="${srcdir}/go-build"
     export GOMODCACHE="${srcdir}/go/pkg/mod"
-    wails build -o "${pkgname}"
+    if [ `curl ifconfig.co/country` == "China" ];then
+        echo 'registry="https://registry.npmmirror.com/"' >> .npmrc
+        echo 'electron_mirror="https://registry.npmmirror.com/-/binary/electron/"' >> .npmrc
+        echo 'electron_builder_binaries_mirror="https://registry.npmmirror.com/-/binary/electron-builder-binaries/"' >> .npmrc
+        export GOPROXY=https://goproxy.cn
+    fi
+    go install github.com/wailsapp/wails/v2/cmd/wails@latest
+    npm install --prefix ./frontend
+    wails build -platform linux -ldflags "-X main.version=v${pkgver}" -o "${pkgname}"
     sed -e "s|{{.Info.ProductName}}|${_pkgname}|g" \
         -e "s|/usr/local/bin/${pkgname}|${pkgname}|g" \
         -e "s|{{.Info.Comments}}|${pkgdesc}|g" \