update to 1.18.4

3 files changed, 27 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25946d7cfc7c..b92ef5e80b38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = escrcpy-bin
 	pkgdesc = 使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动
-	pkgver = 1.18.3
+	pkgver = 1.18.4
 	pkgrel = 1
 	url = https://github.com/viarotel-org/escrcpy
 	arch = aarch64
 	arch = x86_64
 	license = Apache-2.0
 	depends = electron27
-	provides = escrcpy=1.18.3
+	provides = escrcpy=1.18.4
 	conflicts = escrcpy
 	source = escrcpy.sh
-	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
-	source_aarch64 = escrcpy-1.18.3-aarch64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.18.3/Escrcpy-1.18.3-linux-arm64.deb
-	sha256sums_aarch64 = 945e136fb18f8ce3dc049d6a519c3b018dcd44be05d8116b7e5674c17cad37c9
-	source_x86_64 = escrcpy-1.18.3-x86_64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.18.3/Escrcpy-1.18.3-linux-amd64.deb
-	sha256sums_x86_64 = 987cd8bcced958eca86950e4ec934374fbe5756411d87fa54f3bcac74c3ad0d0
+	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
 
 pkgname = escrcpy-bin
diff --git a/PKGBUILD b/PKGBUILD
index 3d07a408ab5f..7c22ff4bb26f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=escrcpy-bin
 _pkgname=Escrcpy
-pkgver=1.18.3
+pkgver=1.18.4
 _electronversion=27
 pkgrel=1
 pkgdesc="使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动"
@@ -21,9 +21,9 @@ source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${url}/releases/download/v
 source=(
     "${pkgname%-bin}.sh"
 )
-sha256sums=('dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
-sha256sums_aarch64=('945e136fb18f8ce3dc049d6a519c3b018dcd44be05d8116b7e5674c17cad37c9')
-sha256sums_x86_64=('987cd8bcced958eca86950e4ec934374fbe5756411d87fa54f3bcac74c3ad0d0')
+sha256sums=('05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a')
+sha256sums_aarch64=('75375ab0a3270afd690f9538700037e8094ad82c5d0bd94e49ef9246a45c609a')
+sha256sums_x86_64=('264c8f9c1f9699479bc6d067a2b97e7b64ad32b3ab7b83fd489e724092c60f41')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
diff --git a/escrcpy.sh b/escrcpy.sh
index 7ddcaab8d734..5594e5380ba2 100644
--- a/escrcpy.sh
+++ b/escrcpy.sh
@@ -7,10 +7,23 @@ export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
 export ELECTRON_FORCE_IS_PACKAGED=true
+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
+if [[ -f "${_FLAGS_FILE}" ]]; then
+    mapfile -t < "${_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}" "$@" || exit $?
+if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $?
 fi
\ No newline at end of file