update to 0.29.1

3 files changed, 26 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4720ad14799d..1cdb72ec6566 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lvce-bin
 	pkgdesc = VS Code inspired text editor that mostly runs in a webworker
-	pkgver = 0.28.4
+	pkgver = 0.29.1
 	pkgrel = 1
 	url = https://lvce-editor.github.io/lvce-editor
 	arch = aarch64
@@ -9,18 +9,18 @@ pkgbase = lvce-bin
 	license = MIT
 	depends = electron28
 	depends = nodejs
-	provides = lvce=0.28.4
+	provides = lvce=0.29.1
 	conflicts = lvce
 	options = !strip
 	source = lintian-lvce
 	source = lvce.sh
 	sha256sums = ada1a0303abece27be80372538645da5c5b4e9d60fcacc87b97da1c26b8931bc
-	sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a
-	source_aarch64 = lvce-0.28.4-aarch64.deb::https://github.com/lvce-editor/lvce-editor/releases/download/v0.28.4/lvce-v0.28.4_arm64.deb
-	sha256sums_aarch64 = 23e1d5f09e39e2d56f5d253cac6d0e7162e73a099a7e1ce113738090ef3f9add
-	source_armv7h = lvce-0.28.4-armv7h.deb::https://github.com/lvce-editor/lvce-editor/releases/download/v0.28.4/lvce-v0.28.4_armhf.deb
-	sha256sums_armv7h = ac1a335d3c8bb21e0f84d91c9190c6ae534e14edb3aa4cf14c2f37884fab5134
-	source_x86_64 = lvce-0.28.4-x86_64.deb::https://github.com/lvce-editor/lvce-editor/releases/download/v0.28.4/lvce-v0.28.4_amd64.deb
-	sha256sums_x86_64 = 84e2fc0286b9ca2ea146230fed7c084da44d47b0ed13e6c297e5d5ea0039cec6
+	sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d
+	source_aarch64 = lvce-0.29.1-aarch64.deb::https://github.com/lvce-editor/lvce-editor/releases/download/v0.29.1/lvce-v0.29.1_arm64.deb
+	sha256sums_aarch64 = 9c58e67b08864c6771f694b7a1bf5c97abf7d0fc944019c8b27a0023fc022ac4
+	source_armv7h = lvce-0.29.1-armv7h.deb::https://github.com/lvce-editor/lvce-editor/releases/download/v0.29.1/lvce-v0.29.1_armhf.deb
+	sha256sums_armv7h = fd2aa56fb3f0ff16dd2c1a680af2b5c1a8ab6b20d52f8ef74bbdd47d4ea36f9b
+	source_x86_64 = lvce-0.29.1-x86_64.deb::https://github.com/lvce-editor/lvce-editor/releases/download/v0.29.1/lvce-v0.29.1_amd64.deb
+	sha256sums_x86_64 = cc411be19c4feaf562ab8ddb594ddf6403932eece8c07d69aa57ae18ff80a771
 
 pkgname = lvce-bin
diff --git a/PKGBUILD b/PKGBUILD
index ceff5a76efc4..6da7708535a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=lvce-bin
-pkgver=0.28.4
+pkgver=0.29.1
 _electronversion=28
 pkgrel=1
 pkgdesc="VS Code inspired text editor that mostly runs in a webworker"
@@ -27,10 +27,10 @@ source=(
     "${pkgname%-bin}.sh"
 )
 sha256sums=('ada1a0303abece27be80372538645da5c5b4e9d60fcacc87b97da1c26b8931bc'
-            '05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a')
-sha256sums_aarch64=('23e1d5f09e39e2d56f5d253cac6d0e7162e73a099a7e1ce113738090ef3f9add')
-sha256sums_armv7h=('ac1a335d3c8bb21e0f84d91c9190c6ae534e14edb3aa4cf14c2f37884fab5134')
-sha256sums_x86_64=('84e2fc0286b9ca2ea146230fed7c084da44d47b0ed13e6c297e5d5ea0039cec6')
+            '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d')
+sha256sums_aarch64=('9c58e67b08864c6771f694b7a1bf5c97abf7d0fc944019c8b27a0023fc022ac4')
+sha256sums_armv7h=('fd2aa56fb3f0ff16dd2c1a680af2b5c1a8ab6b20d52f8ef74bbdd47d4ea36f9b')
+sha256sums_x86_64=('cc411be19c4feaf562ab8ddb594ddf6403932eece8c07d69aa57ae18ff80a771')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
@@ -38,6 +38,7 @@ build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
         -e "s|@runname@|app|g" \
+        -e "s|@cfgdirname@|${pkgname%-bin}|g" \
         -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data."*
diff --git a/lvce.sh b/lvce.sh
index 5594e5380ba2..398398461fee 100644
--- a/lvce.sh
+++ b/lvce.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