update to 1.19.0

3 files changed, 25 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b92ef5e80b38..54ee753ee4b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = escrcpy-bin
 	pkgdesc = 使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动
-	pkgver = 1.18.4
+	pkgver = 1.19.0
 	pkgrel = 1
 	url = https://github.com/viarotel-org/escrcpy
 	arch = aarch64
 	arch = x86_64
 	license = Apache-2.0
-	depends = electron27
-	provides = escrcpy=1.18.4
+	depends = electron30
+	provides = escrcpy=1.19.0
 	conflicts = escrcpy
 	source = escrcpy.sh
-	sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a
-	source_aarch64 = escrcpy-1.18.4-aarch64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.18.4/Escrcpy-1.18.4-linux-arm64.deb
-	sha256sums_aarch64 = 75375ab0a3270afd690f9538700037e8094ad82c5d0bd94e49ef9246a45c609a
-	source_x86_64 = escrcpy-1.18.4-x86_64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.18.4/Escrcpy-1.18.4-linux-amd64.deb
-	sha256sums_x86_64 = 264c8f9c1f9699479bc6d067a2b97e7b64ad32b3ab7b83fd489e724092c60f41
+	sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d
+	source_aarch64 = escrcpy-1.19.0-aarch64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.19.0/Escrcpy-1.19.0-linux-arm64.deb
+	sha256sums_aarch64 = 21fe0795e537c66c4e9c2b5d6e7adde66e4f3e908edfa1cec2ce22b5ba5d6698
+	source_x86_64 = escrcpy-1.19.0-x86_64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.19.0/Escrcpy-1.19.0-linux-amd64.deb
+	sha256sums_x86_64 = 60a3fa2115b8943d9b0fea11d9f33706ef964630f2f0d591c044794537b36158
 
 pkgname = escrcpy-bin
diff --git a/PKGBUILD b/PKGBUILD
index 7c22ff4bb26f..ecb1ff8ac2c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=escrcpy-bin
 _pkgname=Escrcpy
-pkgver=1.18.4
-_electronversion=27
+pkgver=1.19.0
+_electronversion=30
 pkgrel=1
 pkgdesc="使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动"
 arch=(
@@ -21,13 +21,14 @@ source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${url}/releases/download/v
 source=(
     "${pkgname%-bin}.sh"
 )
-sha256sums=('05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a')
-sha256sums_aarch64=('75375ab0a3270afd690f9538700037e8094ad82c5d0bd94e49ef9246a45c609a')
-sha256sums_x86_64=('264c8f9c1f9699479bc6d067a2b97e7b64ad32b3ab7b83fd489e724092c60f41')
+sha256sums=('41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d')
+sha256sums_aarch64=('21fe0795e537c66c4e9c2b5d6e7adde66e4f3e908edfa1cec2ce22b5ba5d6698')
+sha256sums_x86_64=('60a3fa2115b8943d9b0fea11d9f33706ef964630f2f0d591c044794537b36158')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
         -e "s|@runname@|app.asar|g" \
+        -e "s|@cfgdirname@|${pkgname%-bi_pkgnamen}|g" \
         -e "s|@options@||g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data."*
diff --git a/escrcpy.sh b/escrcpy.sh
index 5594e5380ba2..398398461fee 100644
--- a/escrcpy.sh
+++ b/escrcpy.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
-set -e
+set -o pipefail
 _APPDIR="/usr/lib/@appname@"
 _RUNNAME="${_APPDIR}/@runname@"
+_CFGDIR="@cfgdirname@/"
 _OPTIONS="@options@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
@@ -11,19 +12,18 @@ export ELECTRON_DISABLE_SECURITY_WARNINGS=true
 export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@"
 export NODE_ENV=production
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-_FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf"
-declare -a flags
+export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf"
+declare -a _USER_FLAGS
 if [[ -f "${_FLAGS_FILE}" ]]; then
-    mapfile -t < "${_FLAGS_FILE}"
+    while read -r line; do
+        if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
+            _USER_FLAGS+=("${line}")
+        fi
+    done < "${_FLAGS_FILE}"
 fi
-for line in "${MAPFILE[@]}"; do
-    if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then
-        flags+=("${line}")
-    fi
-done
 cd "${_APPDIR}"
 if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
-    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS[@]}" "$@"
 else
-    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS[@]}" "$@"
 fi
\ No newline at end of file