fix errors

3 files changed, 12 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34883d9f0144..37ec56a9e095 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = escrcpy
 	pkgdesc = 使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动
 	pkgver = 1.16.8
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/viarotel-org/escrcpy
 	arch = aarch64
 	arch = x86_64
@@ -16,6 +16,6 @@ pkgbase = escrcpy
 	source = escrcpy.git::git+https://github.com/viarotel-org/escrcpy.git#tag=v1.16.8
 	source = escrcpy.sh
 	sha256sums = SKIP
-	sha256sums = 1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = escrcpy
diff --git a/PKGBUILD b/PKGBUILD
index a1eb13939974..806d0fdded95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=escrcpy
 pkgver=1.16.8
 _electronversion=27
 _nodeversion=18
-pkgrel=3
+pkgrel=4
 pkgdesc="使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动"
 arch=(
     'aarch64'
@@ -27,7 +27,7 @@ source=(
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            '1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
@@ -37,7 +37,7 @@ _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 -q -f -n --categories "Utility" --name "${pkgname}" --exec "${pkgname}"
@@ -50,22 +50,17 @@ build() {
     export ELECTRONVERSION="${_electronversion}"
     export npm_config_disturl=https://electronjs.org/headers
     HOME="${srcdir}/.electron-gyp"
-    sed -e '81,84d' -e 's|"deb"|"AppImage"|g' -i electron-builder.json
+    sed '98d;92,95d;s|"deb",|"AppImage"|g' -i electron-builder.json
     npm install
     npm run build:linux
     cp dist-release/.icon-set/logo_1024.png dist-release/.icon-set/icon_1024x1024.png
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    if [ "${CARCH}" == "aarch64" ];then
-        _os_architecture=linux-arm64-unpacked
-    elif [ "${CARCH}" == "x86_64" ];then
-        _os_architecture=linux-unpacked
-    fi
-    install -Dm644 "${srcdir}/${pkgname}.git/dist-release/${_os_architecture}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}.git/dist-release/${_os_architecture}/resources/extra/common/tray/icon.png" \
+    install -Dm644 "${srcdir}/${pkgname}.git/dist-release/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/dist-release/linux-"*/resources/extra/common/tray/icon.png \
         -t "${pkgdir}/usr/lib/${pkgname}/extra/common/tray"
-    cd "${srcdir}/${pkgname}.git/dist-release/${_os_architecture}/resources/extra/linux"
+    cd "${srcdir}/${pkgname}.git/dist-release/linux-"*/resources/extra/linux
     chmod 755 android-platform-tools/{adb,etc1tool,fastboot,hprof-conv,make_f2fs,make_f2fs_casefold,mke2fs,sqlite3} \
               gnirehtet/gnirehtet
     cp -r "${srcdir}/${pkgname}.git/dist-release/${_os_architecture}/resources/extra/linux" "${pkgdir}/usr/lib/${pkgname}/extra"
diff --git a/escrcpy.sh b/escrcpy.sh
index 0d20cddc70ca..f9ced1432cfc 100644
--- a/escrcpy.sh
+++ b/escrcpy.sh
@@ -1,14 +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}" "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
 fi
\ No newline at end of file