update to 3.4.8

3 files changed, 14 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 510e76cdc2b5..e3117bfd42fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lanzouyun-pan
 	pkgdesc = 蓝奏云网盘、客户端,实现了蓝奏云大部分功能并添加了许多增强型功能,可作为网盘的日常管理工具使用,项目用 electron 构建.
-	pkgver = 3.4.7
+	pkgver = 3.4.8
 	pkgrel = 1
 	url = https://github.com/chenhb23/lanzouyun-disk
 	arch = any
@@ -16,9 +16,9 @@ pkgbase = lanzouyun-pan
 	depends = electron18
 	conflicts = lanzouyun-pan
 	options = !strip
-	source = lanzouyun-pan.git::git+https://github.com/chenhb23/lanzouyun-disk.git#tag=v3.4.7
+	source = lanzouyun-pan.git::git+https://github.com/chenhb23/lanzouyun-disk.git#tag=v3.4.8
 	source = lanzouyun-pan.sh
 	sha256sums = SKIP
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = lanzouyun-pan
diff --git a/PKGBUILD b/PKGBUILD
index 466fdab480c4..e032a5c6acea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=lanzouyun-pan
-pkgver=3.4.7
+pkgver=3.4.8
 _electronversion=18
 _nodeversion=17
 pkgrel=1
@@ -30,7 +30,7 @@ source=(
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
@@ -40,15 +40,19 @@ _ensure_local_nvm() {
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname}|g" \
-        -e "s|@appasar@|app.asar|g" \
+        -e "s|@runname@|app.asar|g" \
         -i "${srcdir}/${pkgname}.sh"
     _ensure_local_nvm
     gendesk -f -n -q --categories "Network" --name "${pkgname}" --exec "${pkgname} %U"
     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 npm_config_disturl="https://electronjs.org/headers"
+    HOME="${srcdir}/.electron-gyp"
     sed -e "s|-mw|-l|g" \
         -e "47i\    \"linux\": {" \
         -e "47i\        \"target\": \"AppImage\"," \
diff --git a/lanzouyun-pan.sh b/lanzouyun-pan.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/lanzouyun-pan.sh
+++ b/lanzouyun-pan.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