fix errors

3 files changed, 55 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7637c8a7fd64..49f596f469e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = switchhosts-git
 	pkgdesc = An app for managing hosts file,and switch hosts quickly!
-	pkgver = 4.2.0.beta.r22.gb88ec9d
-	pkgrel = 1
+	pkgver = 4.2.0.beta.r26.g0d948d9
+	pkgrel = 2
 	url = https://github.com/oldj/SwitchHosts
 	arch = any
 	license = Apache
 	makedepends = gendesk
 	makedepends = git
-	makedepends = nodejs>=18.15.11
-	makedepends = npm>=9.0.0
-	depends = bash
+	makedepends = nvm
+	makedepends = npm
 	depends = electron24
 	depends = hicolor-icon-theme
 	provides = switchhosts
@@ -17,6 +16,6 @@ pkgbase = switchhosts-git
 	source = switchhosts::git+https://github.com/oldj/SwitchHosts.git
 	source = switchhosts.sh
 	sha256sums = SKIP
-	sha256sums = ce889ad0fb018ef15b123c3c26671e2979e947fc333a68b854b1cd964a490979
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = switchhosts-git
diff --git a/PKGBUILD b/PKGBUILD
index 8c9172017334..68146c6cd102 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,64 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-_pkgname=switchhosts
-pkgname="${_pkgname}-git"
-pkgver=4.2.0.beta.r22.gb88ec9d
-pkgrel=1
+pkgname=switchhosts-git
+pkgver=4.2.0.beta.r26.g0d948d9
+_electronversion=24
+_nodeversion=18
+pkgrel=2
 pkgdesc="An app for managing hosts file,and switch hosts quickly!"
 arch=('any')
 url="https://github.com/oldj/SwitchHosts"
 license=('Apache')
-conflicts=(
-    "${_pkgname}"
-)
-provides=(
-    "${_pkgname}"
-)
+conflicts=("${pkgname%-git}")
+provides=("${pkgname%-git}")
 depends=(
-    'bash'
-    'electron24'
+    "electron${_electronversion}"
     'hicolor-icon-theme'
 )
 makedepends=(
     'gendesk'
     'git'
-    'nodejs>=18.15.11'
-    'npm>=9.0.0'
+    'nvm'
+    'npm'
 )
 source=(
-    "${_pkgname}"::"git+${url}.git"
-    "${_pkgname}.sh"
+    "${pkgname%-git}"::"git+${url}.git"
+    "${pkgname%-git}.sh"
 )
 sha256sums=('SKIP'
-            'ce889ad0fb018ef15b123c3c26671e2979e947fc333a68b854b1cd964a490979')
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 pkgver() {
-    cd "${srcdir}/${_pkgname}"
+    cd "${srcdir}/${pkgname%-git}"
     #git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
     git describe --tags | sed 's/\w\+\///g;s/\([^-]*-g\)/r\1/;s/-/./g;s/v//g'
 }
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install "${_nodeversion}"
+    nvm use "${_nodeversion}"
+}
 build() {
-    gendesk -q -f -n --categories "Utility" --pkgname="${_pkgname}" --name="SwitchHosts" --exec="${_pkgname}"
-    cd "${srcdir}/${_pkgname}"
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname%-git}|g" \
+        -e "s|@appasar@|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}"
+    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 ELECTRONVERSION="${_electronversion}"
     npm install
     npm run build
     npm run make:linux
-    cd "${srcdir}/${_pkgname}/dist/.icon-set"
+    cd "${srcdir}/${pkgname%-git}/dist/.icon-set"
     cp icon_16x16.png app_16.png
     cp icon_48x48.png app_48.png
 }
 package() {
-    install -Dm755 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
+    install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}"
     case "${CARCH}" in
         x86_64)
             _architecture="linux-unpacked"
@@ -58,11 +70,11 @@ package() {
             _architecture="linux-armv7l-unpacked"
         ;;
     esac
-    install -Dm644 "${srcdir}/${_pkgname}/dist/${_architecture}/resources/app.asar" -t "${pkgdir}/usr/lib/${_pkgname}/"
-    install -Dm644 "${srcdir}/${_pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
+    install -Dm644 "${srcdir}/${pkgname%-git}/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}.png"
+        install -Dm644 "${srcdir}/${pkgname%-git}/dist/.icon-set/app_${_icons}.png" \
+            "${pkgdir}/usr/share/icons/hicolor/${_icons}x${_icons}/apps/${pkgname%-git}.png"
     done
-    install -Dm644 "${srcdir}/${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
+    install -Dm644 "${srcdir}/${pkgname%-git}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
\ No newline at end of file
diff --git a/switchhosts.sh b/switchhosts.sh
index 6b447eae8ef3..2ec4412e5c4f 100644
--- a/switchhosts.sh
+++ b/switchhosts.sh
@@ -1,10 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron24
-APPDIR="/usr/lib/switchhosts"
-export PATH="${APPDIR}:${PATH}"
-_ASAR="${APPDIR}/app.asar"
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
 fi
\ No newline at end of file