update to 2.3.22

3 files changed, 41 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f24d2c33278..ebcf6edee51f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = apifox-bin
 	pkgdesc = Apifox=Postman+Swagger+Mock+JMeter.API 文档、API 调试、API Mock、API 自动化测试
-	pkgver = 2.3.20
+	pkgver = 2.3.22
 	pkgrel = 1
 	url = https://apifox.com/
 	arch = aarch64
@@ -31,13 +31,15 @@ pkgbase = apifox-bin
 	depends = glibc
 	depends = libxkbcommon
 	depends = libxfixes
-	provides = apifox=2.3.20
+	provides = apifox=2.3.22
 	conflicts = apifox
 	source = LICENSE.html
+	source = apifox.sh
 	sha256sums = 3884df6451dd5aaadc867c2b6882a7feabccb10c7e1df98e48e9fe2414c9fe19
-	source_aarch64 = apifox-2.3.20-aarch64.zip::https://cdn.apifox.cn/download/Apifox-linux-arm64-deb-latest.zip
-	sha256sums_aarch64 = afcef9052c43ec1a5318c986bb3b7c57b0bd4859f52273d493d6dee52ec16ab6
-	source_x86_64 = apifox-2.3.20-x86_64.zip::https://cdn.apifox.cn/download/Apifox-linux-deb-latest.zip
-	sha256sums_x86_64 = 0c619f8e29e914fcb7547da5227a0be3cf38c710a0d7928526e194dba89e7124
+	sha256sums = 3b975bd6352fe7e3233aeb9372cce915909b665bd6d3ddc48a408e571042316c
+	source_aarch64 = apifox-2.3.22-aarch64.zip::https://cdn.apifox.cn/download/Apifox-linux-arm64-latest.zip
+	sha256sums_aarch64 = 91057cc2532325e7184ea904f191333a14428da1ffe1be192b082a65a0d8b35c
+	source_x86_64 = apifox-2.3.22-x86_64.zip::https://cdn.apifox.cn/download/Apifox-linux-latest.zip
+	sha256sums_x86_64 = d951f7c65263e27be7893f89fdbf271ded09c47160274a7274a2c9fc0a4f1419
 
 pkgname = apifox-bin
diff --git a/PKGBUILD b/PKGBUILD
index 5d61a3d4deec..1a90b1e45148 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=apifox-bin
 _pkgname=Apifox
-pkgver=2.3.20
+pkgver=2.3.22
 pkgrel=1
 pkgdesc="Apifox=Postman+Swagger+Mock+JMeter.API 文档、API 调试、API Mock、API 自动化测试"
 arch=('aarch64' 'x86_64')
@@ -13,30 +13,29 @@ provides=("${pkgname%-bin}=${pkgver}")
 depends=('gtk3' 'nss' 'at-spi2-core' 'alsa-lib' 'libxdamage' 'expat' 'cairo' 'libx11' 'dbus' 'hicolor-icon-theme' 'pango' 'mesa' \
   'nspr' 'libxrandr' 'libxext' 'gcc-libs' 'libxcomposite' 'libxcb' 'glib2' 'libcups' 'libdrm' 'glibc' 'libxkbcommon' 'libxfixes')
 makedepends=('asar')
-source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.zip::https://cdn.apifox.cn/download/${_pkgname}-linux-arm64-deb-latest.zip")
-source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.zip::https://cdn.apifox.cn/download/${_pkgname}-linux-deb-latest.zip")
-source=("LICENSE.html")
-sha256sums=('3884df6451dd5aaadc867c2b6882a7feabccb10c7e1df98e48e9fe2414c9fe19')
-sha256sums_aarch64=('afcef9052c43ec1a5318c986bb3b7c57b0bd4859f52273d493d6dee52ec16ab6')
-sha256sums_x86_64=('0c619f8e29e914fcb7547da5227a0be3cf38c710a0d7928526e194dba89e7124')
+source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.zip::https://cdn.apifox.cn/download/${_pkgname}-linux-arm64-latest.zip")
+source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.zip::https://cdn.apifox.cn/download/${_pkgname}-linux-latest.zip")
+source=("LICENSE.html"
+    "${pkgname%-bin}.sh")
+sha256sums=('3884df6451dd5aaadc867c2b6882a7feabccb10c7e1df98e48e9fe2414c9fe19'
+            '3b975bd6352fe7e3233aeb9372cce915909b665bd6d3ddc48a408e571042316c')
+sha256sums_aarch64=('91057cc2532325e7184ea904f191333a14428da1ffe1be192b082a65a0d8b35c')
+sha256sums_x86_64=('d951f7c65263e27be7893f89fdbf271ded09c47160274a7274a2c9fc0a4f1419')
 build() {
-    bsdtar -xf "${pkgname%-bin}_${pkgver}_"*.deb
-    bsdtar -xf "${srcdir}/data.tar.xz"
-    asar e "${srcdir}/opt/${_pkgname}/resources/app.asar" "${srcdir}/app.asar.unpacked"
-    cp -r "${srcdir}/opt/${_pkgname}/resources/app.asar.unpacked" "${srcdir}"
-    rm -rf "${srcdir}/opt/${_pkgname}/resources/app.asar.unpacked"
-    asar p "${srcdir}/app.asar.unpacked" "${srcdir}/opt/${_pkgname}/resources/app.asar"
-    sed "s|/opt/${_pkgname}/${pkgname%-bin}|${pkgname%-bin} -no-sandbox|g;s|Utility|Development|g" \
-        -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    chmod a+x "${srcdir}/${_pkgname}.AppImage"
+    "${srcdir}/${_pkgname}.AppImage" --appimage-extract > /dev/null
+    sed "s|AppRun --no-sandbox %U|${pkgname%-bin} -no-sandbox|g;s|Utility|Development|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
+    find "${srcdir}/squashfs-root" -type d -perm 700 -exec chmod 755 {} \;
 }
 package() {
-    install -Dm755 -d "${pkgdir}/"{opt/"${pkgname%-bin}",usr/bin}
-    cp -r "${srcdir}/opt/${_pkgname}/"* "${pkgdir}/opt/${pkgname%-bin}"
-    ln -sf "/opt/${pkgname%-bin}/${pkgname%-bin}" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
+    cp -r "${srcdir}/squashfs-root/resources/app.asar.unpacked" "${pkgdir}/opt/${pkgname%-bin}/resources"
+    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/opt/${pkgname%-bin}/usr/lib"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512;do
-        install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
+        install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
             -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
     done
+    install -Dm644 "${srcdir}/squashfs-root/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/LICENSE.html" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/apifox.sh b/apifox.sh
new file mode 100644
index 000000000000..c5031de43a82
--- /dev/null
+++ b/apifox.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+_ELECTRON=/usr/bin/electron13
+APPDIR="/opt/apifox"
+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"
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec ${_ELECTRON} ${_ASAR} "$@"
+else
+    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+fi
\ No newline at end of file