fix errors

3 files changed, 25 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0eadb481030c..02b507bb069e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = qcalc-bin
 	pkgdesc = Quasar Calculator
 	pkgver = 0.7.2_fix1
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/from104/qcalc
 	arch = x86_64
 	license = MIT
 	makedepends = fuse2
-	depends = electron25-bin
+	depends = electron25
 	provides = qcalc=0.7.2_fix1
 	conflicts = qcalc
 	source = qcalc-0.7.2_fix1.AppImage::https://github.com/from104/qcalc/releases/download/v0.7.2fix1/Q.Calc-0.7.2-fix1.AppImage
@@ -14,6 +14,6 @@ pkgbase = qcalc-bin
 	source = qcalc.sh
 	sha256sums = 67cbc654697f77918822d77452319591f75367d8b73522febc13d7c8b60387bc
 	sha256sums = 3987b48fb3c79907511fb74614201dbf40f9bff0cc691d4f2dbcad754cba519b
-	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
+	sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
 
 pkgname = qcalc-bin
diff --git a/PKGBUILD b/PKGBUILD
index 51ef4b784e31..3d9046ad5c26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=qcalc-bin
+_pkgname="Q Calc"
 pkgver=0.7.2_fix1
 _electronversion=25
-pkgrel=5
+pkgrel=6
 pkgdesc="Quasar Calculator"
 arch=('x86_64')
 url="https://github.com/from104/qcalc"
@@ -10,7 +11,7 @@ license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
-    "electron${_electronversion}-bin"
+    "electron${_electronversion}"
 )
 makedepends=(
     'fuse2'
@@ -22,11 +23,12 @@ source=(
 )
 sha256sums=('67cbc654697f77918822d77452319591f75367d8b73522febc13d7c8b60387bc'
             '3987b48fb3c79907511fb74614201dbf40f9bff0cc691d4f2dbcad754cba519b'
-            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
+            '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
         -e "s|@runname@|app.asar|g" \
+        -e "s|@cfgdirname@|${_pkgname}|g" \
         -e "s|@options@||g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
diff --git a/qcalc.sh b/qcalc.sh
index 7ddcaab8d734..4cfe3ac09dd8 100644
--- a/qcalc.sh
+++ b/qcalc.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