update to 0.22.0

3 files changed, 21 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7185182ae0dd..383f49571522 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bluestone
 	pkgdesc = A WYSIWYG Markdown editor, improve reading and editing experience.
-	pkgver = 0.21.3
+	pkgver = 0.22.0
 	pkgrel = 1
 	url = https://github.com/1943time/bluestone
 	arch = any
@@ -12,9 +12,9 @@ pkgbase = bluestone
 	makedepends = curl
 	depends = electron29
 	conflicts = bluestone
-	source = bluestone-0.21.3.tar.gz::https://github.com/1943time/bluestone/archive/refs/tags/v0.21.3.tar.gz
+	source = bluestone-0.22.0.tar.gz::https://github.com/1943time/bluestone/archive/refs/tags/v0.22.0.tar.gz
 	source = bluestone.sh
-	sha256sums = bf9a1696ca41d898bb43758091e22dd14154670704f72d9f8520992eaf42f1a4
-	sha256sums = 61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3
+	sha256sums = 1461aa9b4003e2104b38896e58f1c1f4baa64182a11d9836e2f3c869ec7a4a54
+	sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a
 
 pkgname = bluestone
diff --git a/PKGBUILD b/PKGBUILD
index c700e3ba645d..3a1d6aa7d038 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=bluestone
 _pkgname=Bluestone
-pkgver=0.21.3
+_newname=Inkdown
+pkgver=0.22.0
 _electronversion=29
 _nodeversion=18
 pkgrel=1
@@ -24,8 +25,8 @@ source=(
     "${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
     "${pkgname}.sh"
 )
-sha256sums=('bf9a1696ca41d898bb43758091e22dd14154670704f72d9f8520992eaf42f1a4'
-            '61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3')
+sha256sums=('1461aa9b4003e2104b38896e58f1c1f4baa64182a11d9836e2f3c869ec7a4a54'
+            '05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
@@ -39,20 +40,20 @@ build() {
         -e "s|@options@||g" \
         -i "${srcdir}/${pkgname}.sh"
     _ensure_local_nvm
-    gendesk -q -f -n --categories="Utility" --name="${pkgname}" --exec="${pkgname} %U"
+    gendesk -q -f -n --categories="Utility" --name="${_newname}" --exec="${pkgname} %U"
     cd "${srcdir}/${pkgname}-${pkgver}"
     export npm_config_build_from_source=true
     export ELECTRON_SKIP_BINARY_DOWNLOAD=1
     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"
     pnpm config set store-dir "${srcdir}/.pnpm_store"
     pnpm config set cache-dir "${srcdir}/.pnpm_cache"
     pnpm config set link-workspace-packages true
     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/bluestone.sh b/bluestone.sh
index 842c77e19b1d..5594e5380ba2 100644
--- a/bluestone.sh
+++ b/bluestone.sh
@@ -7,14 +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_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 $?