fix errors

3 files changed, 11 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e2101606974..3282e9ab6720 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,17 @@
 pkgbase = jsonbox-bin
 	pkgdesc = A cross platform JSON formatting tool跨平台的json格式化工具
 	pkgver = 2.3.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://docs.r-xnoro.com/jsonbox
 	arch = x86_64
-	license = Apache
-	makedepends = squashfuse
+	license = Apache-2.0
 	depends = electron19
 	depends = hicolor-icon-theme
-	depends = libdbusmenu-glib
-	depends = gtk2
-	depends = dbus-glib
 	provides = jsonbox=2.3.1
 	conflicts = jsonbox
 	source = jsonbox-2.3.1.AppImage::https://docs.r-xnoro.com/jsonbox/dist/jsonbox-2.3.1-linux-x86_64.AppImage
 	source = jsonbox.sh
 	sha256sums = 10971c1196d1e729d10f58e352afb4c4872458a910d2b55b16c670d4becb6a7f
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = jsonbox-bin
diff --git a/PKGBUILD b/PKGBUILD
index 0874b2ed3a56..d0204230d7da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,28 @@
 pkgname=jsonbox-bin
 pkgver=2.3.1
 _electronversion=19
-pkgrel=2
+pkgrel=3
 pkgdesc="A cross platform JSON formatting tool跨平台的json格式化工具"
 arch=('x86_64')
 url="https://docs.r-xnoro.com/jsonbox"
 _ghurl="https://github.com/rexlevin/jsonbox"
-license=('Apache')
+license=('Apache-2.0')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
 depends=(
     "electron${_electronversion}"
     'hicolor-icon-theme'
-    'libdbusmenu-glib'
-    'gtk2'
-    'dbus-glib'
-)
-makedepends=(
-    'squashfuse'
 )
 source=(
     "${pkgname%-bin}-${pkgver}.AppImage::${url}/dist/${pkgname%-bin}-${pkgver}-linux-${CARCH}.AppImage"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('10971c1196d1e729d10f58e352afb4c4872458a910d2b55b16c670d4becb6a7f'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
-        -e "s|@appasar@|app.asar|g" \
+        -e "s|@runname@|app.asar|g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
@@ -38,7 +32,6 @@ build() {
 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}"
-    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/lib"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256;do
         install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
             -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
diff --git a/jsonbox.sh b/jsonbox.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/jsonbox.sh
+++ b/jsonbox.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 set -e
 _APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_ASAR}" "$@"
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit
\ No newline at end of file
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file