update to 4.2.0.beta.r37.g4f10177

3 files changed, 17 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0dc010c9c20b..f95e454e4c6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = switchhosts-git
 	pkgdesc = An app for managing hosts file,and switch hosts quickly!
-	pkgver = 4.2.0.beta.r33.gee49660
+	pkgver = 4.2.0.beta.r37.g4f10177
 	pkgrel = 1
 	url = https://github.com/oldj/SwitchHosts
 	arch = aarch64
 	arch = armv7h
 	arch = x86_64
-	license = Apache
+	license = Apache-2.0
 	makedepends = gendesk
 	makedepends = git
 	makedepends = nvm
@@ -18,6 +18,6 @@ pkgbase = switchhosts-git
 	source = switchhosts.git::git+https://github.com/oldj/SwitchHosts.git
 	source = switchhosts.sh
 	sha256sums = SKIP
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = switchhosts-git
diff --git a/PKGBUILD b/PKGBUILD
index 51bb5cdb2e23..ef41e12862ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=switchhosts-git
-pkgver=4.2.0.beta.r33.gee49660
+pkgver=4.2.0.beta.r37.g4f10177
 _electronversion=24
 _nodeversion=18
 pkgrel=1
@@ -11,7 +11,7 @@ arch=(
     'x86_64'
 )
 url="https://github.com/oldj/SwitchHosts"
-license=('Apache')
+license=('Apache-2.0')
 conflicts=("${pkgname%-git}")
 provides=("${pkgname%-git}")
 depends=(
@@ -29,7 +29,7 @@ source=(
     "${pkgname%-git}.sh"
 )
 sha256sums=('SKIP'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 pkgver() {
     cd "${srcdir}/${pkgname//-/.}"
     #git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
@@ -44,23 +44,23 @@ _ensure_local_nvm() {
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-git}|g" \
-        -e "s|@appasar@|app.asar|g" \
+        -e "s|@runname@|app.asar|g" \
         -i "${srcdir}/${pkgname%-git}.sh"
     _ensure_local_nvm
-    gendesk -q -f -n --categories "Utility" --pkgname="${pkgname%-git}" --name="SwitchHosts" --exec="${pkgname%-git}"
+    gendesk -q -f -n --categories "Utility" --pkgname="${pkgname%-git}" --name="SwitchHosts" --exec="${pkgname%-git} %U"
     cd "${srcdir}/${pkgname//-/.}"
     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}"
-    sed '/deb:/d' -i scripts/make.js
+    export npm_config_disturl=https://electronjs.org/headers
+    HOME="${srcdir}/.electron-gyp"
+    sed '/deb:/d;s|app.icns|app.png|g;/npm.taobao.org/d' -i scripts/make.js
     npm install
     npm run build
     npm run make:linux
-    cd "${srcdir}/${pkgname//-/.}/dist/.icon-set"
-    cp icon_16x16.png app_16.png
-    cp icon_48x48.png app_48.png
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}"
@@ -77,9 +77,6 @@ package() {
     esac
     install -Dm644 "${srcdir}/${pkgname//-/.}/dist/${_architecture}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-git}/"
     install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications"
-    for _icons in 16 32 48 64 128 256 512;do
-        install -Dm644 "${srcdir}/${pkgname//-/.}/dist/.icon-set/app_${_icons}.png" \
-            "${pkgdir}/usr/share/icons/hicolor/${_icons}x${_icons}/apps/${pkgname%-git}.png"
-    done
+    install -Dm644 "${srcdir}/${pkgname//-/.}/assets/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-git}.png"
     install -Dm644 "${srcdir}/${pkgname//-/.}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/switchhosts.sh b/switchhosts.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/switchhosts.sh
+++ b/switchhosts.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 set -e
 _APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_ASAR}" "$@"
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit
\ No newline at end of file
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file