update to 2.3.3

3 files changed, 30 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23a748e3c466..b603dda47bbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = jsonbox-bin
 	pkgdesc = A cross platform JSON formatting tool跨平台的json格式化工具
-	pkgver = 2.3.1
-	pkgrel = 4
+	pkgver = 2.3.3
+	pkgrel = 1
 	url = https://docs.r-xnoro.com/jsonbox
 	arch = x86_64
 	license = Apache-2.0
 	makedepends = fuse2
-	depends = electron19-bin
-	depends = hicolor-icon-theme
-	provides = jsonbox=2.3.1
+	depends = electron19
+	provides = jsonbox=2.3.3
 	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-2.3.3.AppImage::https://docs.r-xnoro.com/jsonbox/dist/jsonbox-2.3.3-linux-x86_64.AppImage
 	source = jsonbox.sh
-	sha256sums = 10971c1196d1e729d10f58e352afb4c4872458a910d2b55b16c670d4becb6a7f
-	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
+	sha256sums = eb998cdf8565aad83b52e5b2b53e6c16281d6f72bc29f3e940194737213db6be
+	sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
 
 pkgname = jsonbox-bin
diff --git a/PKGBUILD b/PKGBUILD
index 49a74e22b0d5..18b4f5bb66fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=jsonbox-bin
-pkgver=2.3.1
+pkgver=2.3.3
 _electronversion=19
-pkgrel=4
+pkgrel=1
 pkgdesc="A cross platform JSON formatting tool跨平台的json格式化工具"
 arch=('x86_64')
 url="https://docs.r-xnoro.com/jsonbox"
@@ -11,8 +11,7 @@ license=('Apache-2.0')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
 depends=(
-    "electron${_electronversion}-bin"
-    'hicolor-icon-theme'
+    "electron${_electronversion}"
 )
 makedepends=(
     'fuse2'
@@ -21,12 +20,13 @@ source=(
     "${pkgname%-bin}-${pkgver}.AppImage::${url}/dist/${pkgname%-bin}-${pkgver}-linux-${CARCH}.AppImage"
     "${pkgname%-bin}.sh"
 )
-sha256sums=('10971c1196d1e729d10f58e352afb4c4872458a910d2b55b16c670d4becb6a7f'
-            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
+sha256sums=('eb998cdf8565aad83b52e5b2b53e6c16281d6f72bc29f3e940194737213db6be'
+            '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
         -e "s|@runname@|app.asar|g" \
+        -e "s|@cfgdirname@|${pkgname%-bin}|g" \
         -e "s|@options@||g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
diff --git a/jsonbox.sh b/jsonbox.sh
index 7ddcaab8d734..4cfe3ac09dd8 100644
--- a/jsonbox.sh
+++ b/jsonbox.sh
@@ -1,16 +1,29 @@
 #!/bin/bash
-set -e
+set -o pipefail
 _APPDIR="/usr/lib/@appname@"
 _RUNNAME="${_APPDIR}/@runname@"
+_CFGDIR="@cfgdirname@/"
 _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 ELECTRON_DISABLE_SECURITY_WARNINGS=true
+export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@"
 export NODE_ENV=production
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf"
+declare -a _USER_FLAGS
+if [[ -f "${_FLAGS_FILE}" ]]; then
+    while read -r line; do
+        if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
+            _USER_FLAGS+=("${line}")
+        fi
+    done < "${_FLAGS_FILE}"
+fi
 cd "${_APPDIR}"
-if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
+if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
+    exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@"
 else
-    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} --no-sandbox "${_USER_FLAGS[@]}" "$@"
 fi
\ No newline at end of file