update to 1.12.1_prod.17

3 files changed, 27 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16d047c68da6..f79f9ae0ffb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
 pkgbase = fsolauncher
 	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 = aarch64
 	arch = x86_64
 	license = MPL-2.0
 	makedepends = gendesk
 	makedepends = npm
 	makedepends = nvm
+	makedepends = curl
 	depends = electron30
-	depends = nodejs
 	conflicts = fsolauncher
 	options = !strip
 	options = !emptydirs
-	source = fsolauncher-1.12.1_prod.16.tar.gz::https://github.com/ItsSim/fsolauncher/archive/refs/tags/1.12.1-prod.16.tar.gz
+	source = fsolauncher-1.12.1_prod.17.tar.gz::https://github.com/ItsSim/fsolauncher/archive/refs/tags/1.12.1-prod.17.tar.gz
 	source = fsolauncher.sh
-	sha256sums = e0bcdf37e317f3f717b434865233a555d0cbb244b05b88e6f09536a20a28fe1f
-	sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a
+	sha256sums = 783c27074687aca193ffa94faabf3f7bb5d445d564b504a030bfa4506ee7c2eb
+	sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d
 
 pkgname = fsolauncher
diff --git a/PKGBUILD b/PKGBUILD
index adba4997483b..2fe2624b2a2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,27 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=fsolauncher
 _pkgname="FreeSO Launcher"
-pkgver=1.12.1_prod.16
+pkgver=1.12.1_prod.17
 _electronversion=30
 _nodeversion=16
 pkgrel=1
 pkgdesc="Official FreeSO Launcher made with Electron"
-arch=('x86_64')
+arch=(
+    'aarch64'
+    'x86_64'
+)
 url="https://beta.freeso.org/"
 _ghurl="https://github.com/ItsSim/fsolauncher"
 license=('MPL-2.0')
 conflicts=("${pkgname}")
 depends=(
     "electron${_electronversion}"
-    'nodejs'
 )
 makedepends=(
     'gendesk'
     'npm'
     'nvm'
+    'curl'
 )
 options=(
     '!strip'
@@ -28,8 +31,8 @@ source=(
     "${pkgname}-${pkgver}.tar.gz::${_ghurl}/archive/refs/tags/${pkgver//_/-}.tar.gz"
     "${pkgname}.sh"
 )
-sha256sums=('e0bcdf37e317f3f717b434865233a555d0cbb244b05b88e6f09536a20a28fe1f'
-            '05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a')
+sha256sums=('783c27074687aca193ffa94faabf3f7bb5d445d564b504a030bfa4506ee7c2eb'
+            '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
@@ -40,6 +43,7 @@ build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname}|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}.sh"
     _ensure_local_nvm
@@ -51,10 +55,10 @@ build() {
     export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
     export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
     export ELECTRONVERSION="${_electronversion}"
-    export npm_config_disturl=https://electronjs.org/headers
     HOME="${srcdir}/.electron-gyp"
     if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then
         export npm_config_registry=https://registry.npmmirror.com
+        export npm_config_disturl=https://registry.npmmirror.com/-/binary/node/
         export npm_config_electron_mirror=https://registry.npmmirror.com/-/binary/electron/
         export npm_config_electron_builder_binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/
     else
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