fix errors

3 files changed, 16 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3282e9ab6720..23a748e3c466 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = jsonbox-bin
 	pkgdesc = A cross platform JSON formatting tool跨平台的json格式化工具
 	pkgver = 2.3.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://docs.r-xnoro.com/jsonbox
 	arch = x86_64
 	license = Apache-2.0
-	depends = electron19
+	makedepends = fuse2
+	depends = electron19-bin
 	depends = hicolor-icon-theme
 	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 = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
+	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
 
 pkgname = jsonbox-bin
diff --git a/PKGBUILD b/PKGBUILD
index d0204230d7da..49a74e22b0d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=jsonbox-bin
 pkgver=2.3.1
 _electronversion=19
-pkgrel=3
+pkgrel=4
 pkgdesc="A cross platform JSON formatting tool跨平台的json格式化工具"
 arch=('x86_64')
 url="https://docs.r-xnoro.com/jsonbox"
@@ -11,19 +11,23 @@ license=('Apache-2.0')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
 depends=(
-    "electron${_electronversion}"
+    "electron${_electronversion}-bin"
     'hicolor-icon-theme'
 )
+makedepends=(
+    'fuse2'
+)
 source=(
     "${pkgname%-bin}-${pkgver}.AppImage::${url}/dist/${pkgname%-bin}-${pkgver}-linux-${CARCH}.AppImage"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('10971c1196d1e729d10f58e352afb4c4872458a910d2b55b16c670d4becb6a7f'
-            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
+            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
         -e "s|@runname@|app.asar|g" \
+        -e "s|@options@||g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
diff --git a/jsonbox.sh b/jsonbox.sh
index f9ced1432cfc..7ddcaab8d734 100644
--- a/jsonbox.sh
+++ b/jsonbox.sh
@@ -1,14 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 _APPDIR="/usr/lib/@appname@"
 _RUNNAME="${_APPDIR}/@runname@"
+_OPTIONS="@options@"
 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 NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
 fi
\ No newline at end of file