update to 2.4.9

3 files changed, 30 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b72af8268f7..70bc2a6d452d 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.4.4
+	pkgver = 2.4.9
 	pkgrel = 1
 	url = https://apifox.com/
 	arch = aarch64
@@ -9,23 +9,18 @@ pkgbase = apifox-bin
 	depends = electron22
 	depends = hicolor-icon-theme
 	depends = java-runtime
-	depends = gdk-pixbuf2
-	depends = lib32-gcc-libs
-	depends = libdbusmenu-glib
+	depends = nodejs
 	depends = lib32-glibc
-	depends = gtk2
-	depends = libxext
-	depends = libx11
-	depends = dbus-glib
-	provides = apifox=2.4.4
+	depends = lib32-gcc-libs
+	provides = apifox=2.4.9
 	conflicts = apifox
 	source = LICENSE.html
 	source = apifox.sh
 	sha256sums = 3884df6451dd5aaadc867c2b6882a7feabccb10c7e1df98e48e9fe2414c9fe19
-	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
-	source_aarch64 = apifox-2.4.4-aarch64.zip::https://cdn.apifox.cn/download/Apifox-linux-arm64-latest.zip
-	sha256sums_aarch64 = 52701658898f9c9d34998fec0f9e9486e971737e2faa03acd3e93a8d0bdfee0f
-	source_x86_64 = apifox-2.4.4-x86_64.zip::https://cdn.apifox.cn/download/Apifox-linux-latest.zip
-	sha256sums_x86_64 = 8836e0ce091ed2e6fbcc9ae0fd75bbe5047f3f084d075793e6e67c5c9ea14ab6
+	sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
+	source_aarch64 = apifox-2.4.9-aarch64.zip::https://cdn.apifox.cn/download/Apifox-linux-arm64-deb-latest.zip
+	sha256sums_aarch64 = bfedd899ae5776f044af046ea978f851aada1e4082d396e7664569726f6108ee
+	source_x86_64 = apifox-2.4.9-x86_64.zip::https://cdn.apifox.cn/download/Apifox-linux-deb-latest.zip
+	sha256sums_x86_64 = c26d9439b813fc1472c016ab580fdb839ff6b803883cac9fe1751623c975c52a
 
 pkgname = apifox-bin
diff --git a/PKGBUILD b/PKGBUILD
index fdf8fc319fe7..2a6ecf4881f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=apifox-bin
 _pkgname=Apifox
-pkgver=2.4.4
+pkgver=2.4.9
 _electronversion=22
 pkgrel=1
 pkgdesc="Apifox=Postman+Swagger+Mock+JMeter.API 文档、API 调试、API Mock、API 自动化测试"
@@ -15,44 +15,37 @@ depends=(
     "electron${_electronversion}"
     'hicolor-icon-theme'
     'java-runtime'
-    'gdk-pixbuf2'
-    'lib32-gcc-libs'
-    'libdbusmenu-glib'
+    'nodejs'
     'lib32-glibc'
-    'gtk2'
-    'libxext'
-    'libx11'
-    'dbus-glib'
+    'lib32-gcc-libs'
 )
-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_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"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('3884df6451dd5aaadc867c2b6882a7feabccb10c7e1df98e48e9fe2414c9fe19'
-            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
-sha256sums_aarch64=('52701658898f9c9d34998fec0f9e9486e971737e2faa03acd3e93a8d0bdfee0f')
-sha256sums_x86_64=('8836e0ce091ed2e6fbcc9ae0fd75bbe5047f3f084d075793e6e67c5c9ea14ab6')
+            '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
+sha256sums_aarch64=('bfedd899ae5776f044af046ea978f851aada1e4082d396e7664569726f6108ee')
+sha256sums_x86_64=('c26d9439b813fc1472c016ab580fdb839ff6b803883cac9fe1751623c975c52a')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
         -e "s|@appasar@|app.asar|g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
-    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 {} \;
+    bsdtar -xf "${srcdir}/${pkgname%-bin}_${pkgver}_"*.deb
+    bsdtar -xf "${srcdir}/data.tar.xz"
+    sed "s|/opt/${_pkgname}/${pkgname%-bin}|${pkgname%-bin}|g;s|Utility|Development|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
-    cp -r "${srcdir}/squashfs-root/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/lib"
+    install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/opt/${_pkgname}/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname%-bin}"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512;do
-        install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
+        install -Dm644 "${srcdir}/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}/usr/share/applications/${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
index 2ec4412e5c4f..c77c53567639 100644
--- a/apifox.sh
+++ b/apifox.sh
@@ -1,14 +1,17 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 _APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
 export PATH="${_APPDIR}:${PATH}"
-export ELECTRON_IS_DEV=0
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${_APPDIR}/@appasar@"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     cd "${_APPDIR}"
     exec electron@electronversion@ "${_ASAR}" "$@"
+    exit
 else
     cd "${_APPDIR}"
     exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+    exit
 fi
\ No newline at end of file