update to 1.4.2

3 files changed, 30 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 029e8bebafa8..a1bb0771bd26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 pkgbase = pharmaspot-bin
 	pkgdesc = A cross-platform Point of Sale system designed for pharmacies and built to streamline operations and enhance customer service.
-	pkgver = 1.4.1
+	pkgver = 1.4.2
 	pkgrel = 1
 	url = https://github.com/drkNsubuga/PharmaSpot
 	arch = x86_64
 	license = MIT
 	makedepends = gendesk
 	depends = electron22
-	provides = pharmaspot=1.4.1
+	provides = pharmaspot=1.4.2
 	conflicts = pharmaspot
 	options = !emptydirs
-	source = pharmaspot-1.4.1.zip::https://github.com/drkNsubuga/PharmaSpot/releases/download/v1.4.1/Pharmaspot-linux-x64-1.4.1.zip
-	source = LICENSE-1.4.1::https://raw.githubusercontent.com/drkNsubuga/PharmaSpot/v1.4.1/LICENSE
-	source = pharmaspot-1.4.1.png::https://raw.githubusercontent.com/drkNsubuga/PharmaSpot/v1.4.1/assets/images/favicon.png
+	source = pharmaspot-1.4.2.zip::https://github.com/drkNsubuga/PharmaSpot/releases/download/v1.4.2/Pharmaspot-linux-x64-1.4.2.zip
+	source = LICENSE-1.4.2::https://raw.githubusercontent.com/drkNsubuga/PharmaSpot/v1.4.2/LICENSE
+	source = pharmaspot-1.4.2.png::https://raw.githubusercontent.com/drkNsubuga/PharmaSpot/v1.4.2/assets/images/favicon.png
 	source = pharmaspot.sh
-	sha256sums = 4814c7009534caa7b22a46da33f6551f237a077d987a695eb7eb57756c849c49
+	sha256sums = 47d6b6da246deaa7d00be6b83673b4a0fbc95f9ad7f966d2d8d7592c1945733e
 	sha256sums = 66d59240c025ee617d78f981b88b1bb53393e657f064f9e8e0d68204644d8e1c
 	sha256sums = ba44229f6c0a35bb02fe584adb1b33029c78a80b2bdb96877ddff05c3b6ac17a
-	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
+	sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d
 
 pkgname = pharmaspot-bin
diff --git a/PKGBUILD b/PKGBUILD
index 9b11c83d3858..14a18447080e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=pharmaspot-bin
 _pkgname=Pharmaspot
-pkgver=1.4.1
+_cfgdirname=PharmaSpot
+pkgver=1.4.2
 _electronversion=22
 pkgrel=1
 pkgdesc="A cross-platform Point of Sale system designed for pharmacies and built to streamline operations and enhance customer service."
@@ -25,14 +26,15 @@ source=(
     "${pkgname%-bin}-${pkgver}.png::https://raw.githubusercontent.com/drkNsubuga/PharmaSpot/v${pkgver}/assets/images/favicon.png"
     "${pkgname%-bin}.sh"
 )
-sha256sums=('4814c7009534caa7b22a46da33f6551f237a077d987a695eb7eb57756c849c49'
+sha256sums=('47d6b6da246deaa7d00be6b83673b4a0fbc95f9ad7f966d2d8d7592c1945733e'
             '66d59240c025ee617d78f981b88b1bb53393e657f064f9e8e0d68204644d8e1c'
             'ba44229f6c0a35bb02fe584adb1b33029c78a80b2bdb96877ddff05c3b6ac17a'
-            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
+            '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
-        -e "s|@runname@|app|g" \
+        -e "s|@runname@|app.asar|g" \
+        -e "s|@cfgdirname@|${_cfgdirname}|g" \
         -e "s|@options@||g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     gendesk -q -f -n --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-bin} %U"
diff --git a/pharmaspot.sh b/pharmaspot.sh
index 7ddcaab8d734..398398461fee 100644
--- a/pharmaspot.sh
+++ b/pharmaspot.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