update to 1.12.1_prod.17

3 files changed, 19 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3f3da8ad633..fa1c98876357 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = fsolauncher-bin
 	pkgdesc = Official FreeSO Launcher made with Electron
-	pkgver = 1.12.1_prod.16
+	pkgver = 1.12.1_prod.17
 	pkgrel = 1
 	url = https://beta.freeso.org/
 	arch = x86_64
@@ -8,9 +8,9 @@ pkgbase = fsolauncher-bin
 	depends = electron30
 	conflicts = fsolauncher
 	options = !emptydirs
-	source = fsolauncher-1.12.1_prod.16.deb::https://github.com/ItsSim/fsolauncher/releases/download/1.12.1-prod.16/fsolauncher-1.12.1-prod.16.deb
+	source = fsolauncher-1.12.1_prod.17.deb::https://github.com/ItsSim/fsolauncher/releases/download/1.12.1-prod.17/fsolauncher-1.12.1-prod.17.deb
 	source = fsolauncher.sh
-	sha256sums = 84fd3df557e48b62daa48cb97fe69e5e7d8b93f1fc427a3495aca85795950662
-	sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a
+	sha256sums = 8450575bde582cabae3f4991d7e887c95d35a35efcb3a8e91b0c8c7a1bc39d04
+	sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d
 
 pkgname = fsolauncher-bin
diff --git a/PKGBUILD b/PKGBUILD
index e7491bd10dc2..f3bdce997fe5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=fsolauncher-bin
 _pkgname="FreeSO Launcher"
-pkgver=1.12.1_prod.16
+pkgver=1.12.1_prod.17
 _electronversion=30
 pkgrel=1
 pkgdesc="Official FreeSO Launcher made with Electron"
@@ -21,12 +21,13 @@ source=(
     "${pkgname%-bin}-${pkgver}.deb::${_ghurl}/releases/download/${pkgver//_/-}/${pkgname%-bin}-${pkgver//_/-}.deb"
     "${pkgname%-bin}.sh"
 )
-sha256sums=('84fd3df557e48b62daa48cb97fe69e5e7d8b93f1fc427a3495aca85795950662'
-            '05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a')
+sha256sums=('8450575bde582cabae3f4991d7e887c95d35a35efcb3a8e91b0c8c7a1bc39d04'
+            '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d')
 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@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data."*
diff --git a/fsolauncher.sh b/fsolauncher.sh
index 5594e5380ba2..398398461fee 100644
--- a/fsolauncher.sh
+++ b/fsolauncher.sh
@@ -1,7 +1,8 @@
 #!/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}"
@@ -11,19 +12,18 @@ 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}"
-_FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf"
-declare -a flags
+export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf"
+declare -a _USER_FLAGS
 if [[ -f "${_FLAGS_FILE}" ]]; then
-    mapfile -t < "${_FLAGS_FILE}"
+    while read -r line; do
+        if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
+            _USER_FLAGS+=("${line}")
+        fi
+    done < "${_FLAGS_FILE}"
 fi
-for line in "${MAPFILE[@]}"; do
-    if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then
-        flags+=("${line}")
-    fi
-done
 cd "${_APPDIR}"
 if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
-    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS[@]}" "$@"
 else
-    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS[@]}" "$@"
 fi
\ No newline at end of file