fix errors

3 files changed, 18 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 542dc29c0c8c..a441fae958d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ih8rtcgui
 	pkgdesc = RTC Jazz (EWM) simple desktop application to manage/view workitems
 	pkgver = 0.0.7
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/kenny59/ih8rtcgui
 	arch = any
 	license = ISC
@@ -14,7 +14,7 @@ pkgbase = ih8rtcgui
 	options = !strip
 	source = ih8rtcgui.git::git+https://github.com/kenny59/ih8rtcgui.git#tag=v0.0.7
 	source = ih8rtcgui.sh
-	sha256sums = SKIP
-	sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe
+	sha256sums = 0a168dae3136de44ed872422151bbdd889315c4aaba798c6fc3e85e44d48089b
+	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
 
 pkgname = ih8rtcgui
diff --git a/PKGBUILD b/PKGBUILD
index 415f7ccee4cb..36ccca3d5e3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=ih8rtcgui
 pkgver=0.0.7
 _electronversion=28
-pkgrel=3
+pkgrel=4
 pkgdesc="RTC Jazz (EWM) simple desktop application to manage/view workitems"
 arch=('any')
 url="https://github.com/kenny59/ih8rtcgui"
@@ -21,12 +21,13 @@ options=('!strip')
 source=(
     "${pkgname}.git::git+${url}.git#tag=v${pkgver}"
     "${pkgname}.sh")
-sha256sums=('SKIP'
-            '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe')
+sha256sums=('0a168dae3136de44ed872422151bbdd889315c4aaba798c6fc3e85e44d48089b'
+            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname}|g" \
         -e "s|@runname@|app|g" \
+        -e "s|@options@||g" \
         -i "${srcdir}/${pkgname}.sh"
     gendesk -q -f -n --categories="Utility" --name="${pkgname}" --exec="${pkgname} %U"
     cd "${srcdir}/${pkgname}.git"
@@ -38,7 +39,14 @@ build() {
     export ELECTRONVERSION="${_electronversion}"
     export npm_config_disturl=https://electronjs.org/headers
     HOME="${srcdir}/.electron-gyp"
-    sed "s|--win|-l AppImage|g" -i package.json
+    if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];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
+    else
+        echo "Your network is OK."
+    fi
+    sed "s|--win --publish never|--dir|g" -i package.json
     npm install
     npm run build
 }
diff --git a/ih8rtcgui.sh b/ih8rtcgui.sh
index 86cb3dc6a9bf..7ddcaab8d734 100644
--- a/ih8rtcgui.sh
+++ b/ih8rtcgui.sh
@@ -2,6 +2,7 @@
 set -e
 _APPDIR="/usr/lib/@appname@"
 _RUNNAME="${_APPDIR}/@runname@"
+_OPTIONS="@options@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
@@ -9,7 +10,7 @@ export ELECTRON_FORCE_IS_PACKAGED=true
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
 fi
\ No newline at end of file