update to 1.11.2

3 files changed, 35 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1472d07f62c5..f7840c71c1c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = escrcpy
 	pkgdesc = 使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动
-	pkgver = 1.9.1
+	pkgver = 1.11.2
 	pkgrel = 1
 	url = https://github.com/viarotel-org/escrcpy
 	arch = aarch64
@@ -12,11 +12,10 @@ pkgbase = escrcpy
 	depends = bash
 	depends = electron27
 	depends = scrcpy
-	depends = android-sdk-platform-tools
 	conflicts = escrcpy
-	source = escrcpy-1.9.1.zip::https://github.com/viarotel-org/escrcpy/archive/refs/tags/v1.9.1.zip
+	source = escrcpy-1.11.2.zip::https://github.com/viarotel-org/escrcpy/archive/refs/tags/v1.11.2.zip
 	source = escrcpy.sh
-	sha256sums = 7c9a813752801c7a498ee216d84a95e2276aef94f88ec43413eab78c2aac5b2a
-	sha256sums = 95b1863c49ed526e664d14fcb4cfe30be5f4f581dc60903a7421a91354ff3a61
+	sha256sums = 6a2f86e9d4735b4833576bc416cbfbaae5d141132e7a2f36e5ad844f9efe2029
+	sha256sums = 941cb7196d03283a6e65a2271f0c8381a9ec8176f38ce9dc9916f3f89b29a720
 
 pkgname = escrcpy
diff --git a/PKGBUILD b/PKGBUILD
index ef13f9ecfe5b..779d835fb19e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,49 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=escrcpy
-pkgver=1.9.1
+pkgver=1.11.2
 pkgrel=1
 pkgdesc="使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动"
 arch=('aarch64' 'x86_64')
 url="https://github.com/viarotel-org/escrcpy"
 license=('MIT')
 conflicts=("${pkgname}")
-depends=('bash' 'electron27' 'scrcpy' 'android-sdk-platform-tools')
-makedepends=('gendesk' 'npm>=9.8.1' 'nodejs>=18.18.0')
-source=("${pkgname}-${pkgver}.zip::${url}/archive/refs/tags/v${pkgver}.zip"
-    "${pkgname}.sh")
-sha256sums=('7c9a813752801c7a498ee216d84a95e2276aef94f88ec43413eab78c2aac5b2a'
-            '95b1863c49ed526e664d14fcb4cfe30be5f4f581dc60903a7421a91354ff3a61')
+depends=(
+    'bash'
+    'electron27'
+    'scrcpy'
+)
+makedepends=(
+    'gendesk'
+    'npm>=9.8.1'
+    'nodejs>=18.18.0'
+)
+source=(
+    "${pkgname}-${pkgver}.zip::${url}/archive/refs/tags/v${pkgver}.zip"
+    "${pkgname}.sh"
+)
+sha256sums=('6a2f86e9d4735b4833576bc416cbfbaae5d141132e7a2f36e5ad844f9efe2029'
+            '941cb7196d03283a6e65a2271f0c8381a9ec8176f38ce9dc9916f3f89b29a720')
 build() {
     gendesk -q -f -n --categories "Utility" --name "${pkgname}" --exec "${pkgname}"
     cd "${srcdir}/${pkgname}-${pkgver}"
-    sed '80,83d' -i electron-builder.json
+    sed '81,84d' -i electron-builder.json
     npm install
     npm run build:linux
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
     if [ "${CARCH}" == "aarch64" ];then
-        install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/linux-arm64-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
-        install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/linux-arm64-unpacked/resources/extra/"*.png \
-            -t "${pkgdir}/opt/${pkgname}/resources/extra"
+        _os_architecture=linux-arm64-unpacked
     elif [ "${CARCH}" == "x86_64" ];then
-        install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
-        install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/linux-unpacked/resources/extra/"*.png \
-            -t "${pkgdir}/opt/${pkgname}/resources/extra"
+        _os_architecture=linux-unpacked
     fi
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/${_os_architecture}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/${_os_architecture}/resources/extra/common/tray/icon.png" \
+        -t "${pkgdir}/usr/lib/${pkgname%-bin}/extra/common/tray"
+    cd "${srcdir}/${pkgname}-${pkgver}/dist-release/${_os_architecture}/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}-${pkgver}/dist-release/${_os_architecture}/resources/extra/linux" "${pkgdir}/usr/lib/${pkgname%-bin}/extra"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/assets/logo-298bebc1.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/escrcpy.sh b/escrcpy.sh
index 83c1d8a81f07..b2507a2428fc 100644
--- a/escrcpy.sh
+++ b/escrcpy.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron27
-APPDIR="/opt/escrcpy"
-export PATH="${APPDIR}:${APPDIR}/usr/sbin:${PATH}"
-export XDG_DATA_DIRS="./share/:/usr/share/gnome:/usr/local/share/:/usr/share/:${XDG_DATA_DIRS}"
-export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
-export XDG_DATA_DIRS="${APPDIR}"/usr/share/:"${XDG_DATA_DIRS}":/usr/share/gnome/:/usr/local/share/:/usr/share/
-export GSETTINGS_SCHEMA_DIR="${APPDIR}/usr/share/glib-2.0/schemas:${GSETTINGS_SCHEMA_DIR}"
-_ASAR="${APPDIR}/resources/app.asar"
+APPDIR="/usr/lib/escrcpy"
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else