update to 1.16.7

3 files changed, 29 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe6d346b496d..e7804a5c9f51 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 pkgbase = escrcpy
 	pkgdesc = 使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动
-	pkgver = 1.16.3
+	pkgver = 1.16.7
 	pkgrel = 1
 	url = https://github.com/viarotel-org/escrcpy
 	arch = aarch64
 	arch = x86_64
 	license = MIT
 	makedepends = gendesk
-	makedepends = npm>=9.8.1
-	makedepends = nodejs>=18.18.0
+	makedepends = npm
+	makedepends = nvm
 	makedepends = git
 	depends = electron27
 	depends = hicolor-icon-theme
 	depends = scrcpy
 	conflicts = escrcpy
-	source = escrcpy-1.16.3::git+https://github.com/viarotel-org/escrcpy.git#tag=v1.16.3
+	source = escrcpy-1.16.7::git+https://github.com/viarotel-org/escrcpy.git#tag=v1.16.7
 	source = escrcpy.sh
 	sha256sums = SKIP
-	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
+	sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
 
 pkgname = escrcpy
diff --git a/PKGBUILD b/PKGBUILD
index 29b573bf39c6..1e78f9bd3b5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=escrcpy
-pkgver=1.16.3
+pkgver=1.16.7
 _electronversion=27
+_nodeversion=18
 pkgrel=1
 pkgdesc="使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动"
 arch=(
@@ -18,8 +19,8 @@ depends=(
 )
 makedepends=(
     'gendesk'
-    'npm>=9.8.1'
-    'nodejs>=18.18.0'
+    'npm'
+    'nvm'
     'git'
 )
 source=(
@@ -27,19 +28,26 @@ source=(
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
+            '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install "${_nodeversion}"
+    nvm use "${_nodeversion}"
+}
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
-        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appname@|${pkgname}|g" \
         -e "s|@appasar@|app.asar|g" \
-        -i "${srcdir}/${pkgname%-bin}.sh"
+        -i "${srcdir}/${pkgname}.sh"
+    _ensure_local_nvm
     gendesk -q -f -n --categories "Utility" --name "${pkgname}" --exec "${pkgname}"
     cd "${srcdir}/${pkgname}-${pkgver}"
     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}"
+    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}"
     sed -e '81,84d' -e 's|"deb"|"AppImage"|g' -i electron-builder.json
     npm install
     npm run build:linux
diff --git a/escrcpy.sh b/escrcpy.sh
index 2ec4412e5c4f..c77c53567639 100644
--- a/escrcpy.sh
+++ b/escrcpy.sh
@@ -1,14 +1,17 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 _APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
 export PATH="${_APPDIR}:${PATH}"
-export ELECTRON_IS_DEV=0
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${_APPDIR}/@appasar@"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     cd "${_APPDIR}"
     exec electron@electronversion@ "${_ASAR}" "$@"
+    exit
 else
     cd "${_APPDIR}"
     exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+    exit
 fi
\ No newline at end of file