update to 1.1.9.r15.g6430dee

2 files changed, 16 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93dfed024795..ac2287e4f0b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tiny-rdm-git
 	pkgdesc = A modern lightweight cross-platform Redis desktop manager
-	pkgver = 1.1.9.r0.ga431467
+	pkgver = 1.1.9.r15.g6430dee
 	pkgrel = 1
 	url = https://redis.tinycraft.cc/
 	arch = any
@@ -9,7 +9,6 @@ pkgbase = tiny-rdm-git
 	makedepends = npm
 	makedepends = git
 	makedepends = go
-	makedepends = wails
 	makedepends = gcc
 	depends = gtk3
 	depends = webkit2gtk
diff --git a/PKGBUILD b/PKGBUILD
index 5a4bff314152..6f6346b47b4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=tiny-rdm-git
 _pkgname="Tiny RDM"
-pkgver=1.1.9.r0.ga431467
+pkgver=1.1.9.r15.g6430dee
 _nodeversion=18
 pkgrel=1
 pkgdesc="A modern lightweight cross-platform Redis desktop manager"
@@ -19,7 +19,6 @@ makedepends=(
     'npm'
     'git'
     'go'
-    'wails'
     'gcc'
 )
 options=(
@@ -44,16 +43,24 @@ build() {
     cd "${srcdir}/${pkgname%-git}.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%-git}"
+    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 -o "${pkgname%-git}"
     sed -e "s|{{.Info.ProductName}}|${_pkgname}|g" \
         -e "s|/usr/local/bin/${pkgname%-git}|${pkgname%-git}|g" \
         -e "s|{{.Info.Comments}}|${pkgdesc}|g" \