update to 0.2.6.r0.g276f14e

3 files changed, 16 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df37aba7b19a..5493161d13de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bookord-git
 	pkgdesc = An e-book reader
-	pkgver = 0.2.5.r8.ge8ebe4c
+	pkgver = 0.2.6.r0.g276f14e
 	pkgrel = 1
 	url = https://github.com/LiprikON2/Bookord
 	arch = any
@@ -10,11 +10,11 @@ pkgbase = bookord-git
 	makedepends = nvm
 	makedepends = gendesk
 	depends = electron29
-	provides = bookord=0.2.5
+	provides = bookord=0.2.6
 	conflicts = bookord
 	source = bookord.git::git+https://github.com/LiprikON2/Bookord.git
 	source = bookord.sh
 	sha256sums = SKIP
-	sha256sums = 24c1c5b90cba47cd3d7a3ff11a934fcdbb499f8c56423d22009ef33a775e2d21
+	sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a
 
 pkgname = bookord-git
diff --git a/PKGBUILD b/PKGBUILD
index e6269ac57168..0003347a8327 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=bookord-git
 _pkgname=Bookord
-pkgver=0.2.5.r8.ge8ebe4c
+pkgver=0.2.6.r0.g276f14e
 _electronversion=29
 _nodeversion=20
 pkgrel=1
@@ -24,7 +24,7 @@ source=(
     "${pkgname//-/.}::git+${url}.git"
     "${pkgname%-git}.sh")
 sha256sums=('SKIP'
-            '24c1c5b90cba47cd3d7a3ff11a934fcdbb499f8c56423d22009ef33a775e2d21')
+            '05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a')
 pkgver() {
     cd "${srcdir}/${pkgname//-/.}"
     git describe --long --tags | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
@@ -50,16 +50,15 @@ 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://registry.npmmirror.com/-/binary/node/
     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
         echo "Your network is OK."
     fi
-    sed "s|mainIpc|mainIPC|g" -i src/main/mainWindow.ts
     npm install
     npm run package
 }
diff --git a/bookord.sh b/bookord.sh
index 79987c30c522..5594e5380ba2 100644
--- a/bookord.sh
+++ b/bookord.sh
@@ -7,16 +7,22 @@ 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_RUN_AS_NODE=0
 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"
-if [ -r "${_FLAGS_FILE}" ]; then
-    _USER_FLAGS="$(cat "${_FLAGS_FILE}")"
+declare -a flags
+if [[ -f "${_FLAGS_FILE}" ]]; then
+    mapfile -t < "${_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
+if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
     exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $?
 else
     exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $?