update to 0.20.1

3 files changed, 42 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf6e80ef7e09..cdf71caf498f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = bluestone
 	pkgdesc = A WYSIWYG Markdown editor, improve reading and editing experience.
-	pkgver = 0.14.1
+	pkgver = 0.20.1
 	pkgrel = 1
 	url = https://github.com/1943time/bluestone
-	arch = x86_64
+	arch = any
 	license = AGPL-3.0-only
 	makedepends = pnpm
 	makedepends = gendesk
 	makedepends = npm
 	makedepends = nvm
 	makedepends = git
-	depends = alsa-lib
-	depends = nss
-	depends = nspr
-	depends = gtk3
+	depends = electron29
 	conflicts = bluestone
-	source = bluestone.git::git+https://github.com/1943time/bluestone.git#tag=v0.14.1
+	source = bluestone.git::git+https://github.com/1943time/bluestone.git#tag=v0.20.1
+	source = bluestone.sh
 	sha256sums = SKIP
+	sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe
 
 pkgname = bluestone
diff --git a/PKGBUILD b/PKGBUILD
index 5a08988da315..dab39a836d63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,17 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=bluestone
 _pkgname=Bluestone
-pkgver=0.14.1
-_electronversion=22
+pkgver=0.20.1
+_electronversion=29
 _nodeversion=18
 pkgrel=1
 pkgdesc="A WYSIWYG Markdown editor, improve reading and editing experience."
-arch=('x86_64')
+arch=('any')
 url="https://github.com/1943time/bluestone"
 license=('AGPL-3.0-only')
 conflicts=("${pkgname}")
 depends=(
-    'alsa-lib'
-    'nss'
-    'nspr'
-    'gtk3'
+    "electron${_electronversion}"
 )
 makedepends=(
     'pnpm'
@@ -25,8 +22,10 @@ makedepends=(
 )
 source=(
     "${pkgname}.git::git+${url}.git#tag=v${pkgver}"
+    "${pkgname}.sh"
 )
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
@@ -34,8 +33,12 @@ _ensure_local_nvm() {
     nvm use "${_nodeversion}"
 }
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname}|g" \
+        -e "s|@runname@|app.asar|g" \
+        -i "${srcdir}/${pkgname}.sh"
     _ensure_local_nvm
-    gendesk -q -f -n --categories="Utility" --name="${pkgname}" --exec="${pkgname} --no-sandbox %U"
+    gendesk -q -f -n --categories="Utility" --name="${pkgname}" --exec="${pkgname} %U"
     cd "${srcdir}/${pkgname}.git"
     export npm_config_build_from_source=true
     export ELECTRON_SKIP_BINARY_DOWNLOAD=1
@@ -44,19 +47,24 @@ build() {
     export ELECTRONVERSION="${_electronversion}"
     export npm_config_disturl=https://electronjs.org/headers
     HOME="${srcdir}/.electron-gyp"
+    if [ `curl ifconfig.co/country` == "China" ];then
+        echo 'registry="https://registry.npmmirror.com/"' >> .npmrc
+        echo 'electron_mirror="https://registry.npmmirror.com/-/binary/electron/"' >> .npmrc
+        echo 'electron_builder_binaries_mirror="https://registry.npmmirror.com/-/binary/electron-builder-binaries/"' >> .npmrc
+    fi
     pnpm config set store-dir "${srcdir}/.pnpm_store"
     pnpm config set cache-dir "${srcdir}/.pnpm_cache"
     pnpm config set link-workspace-packages true
-    sed "s|--arm64 ||g" -i package.json
+    sed "s|--arm64 --x64||g" -i package.json
     sed '/deb/d' -i electron-builder.yml
     pnpm install --no-frozen-lockfile
     pnpm run build
     pnpm run build:linux
 }
 package() {
-    install -Dm755 -d "${pkgdir}/"{opt/"${pkgname}",usr/bin}
-    cp -r  "${srcdir}/${pkgname}.git/dist/linux-unpacked/"* "${pkgdir}/opt/${pkgname}"
-    ln -sf "/opt/${pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
+    cp -r  "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar.unpacked "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/${pkgname}.git/resources/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
     install -Dm644  "${srcdir}/${pkgname}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/bluestone.sh b/bluestone.sh
new file mode 100644
index 000000000000..86cb3dc6a9bf
--- /dev/null
+++ b/bluestone.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+_APPDIR="/usr/lib/@appname@"
+_RUNNAME="${_APPDIR}/@runname@"
+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 NODE_ENV=production
+cd "${_APPDIR}"
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
+else
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file