update to 1.1.0.r0.gda666f5

3 files changed, 19 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 516e04cc50c7..aaf684016440 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hexopress-git
 	pkgdesc = A client software designed specifically for editing blog articles and managing blog content that supports Hexo!.
-	pkgver = 1.0.0.alpha.2.r1.g57d4e70
+	pkgver = 1.1.0.r0.gda666f5
 	pkgrel = 1
 	url = http://blog.charlestang.org/HexoPress/
 	arch = any
@@ -9,12 +9,12 @@ pkgbase = hexopress-git
 	makedepends = git
 	makedepends = npm
 	makedepends = nodejs
-	depends = electron28
+	depends = electron29
 	provides = hexopress
 	conflicts = hexopress
 	source = hexopress.git::git+https://github.com/charlestang/HexoPress.git
 	source = hexopress.sh
 	sha256sums = SKIP
-	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
+	sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe
 
 pkgname = hexopress-git
diff --git a/PKGBUILD b/PKGBUILD
index 85037ebabdb8..974f9efd7c6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=hexopress-git
 _pkgname=HexoPress
-pkgver=1.0.0.alpha.2.r1.g57d4e70
-_electronversion=28
+pkgver=1.1.0.r0.gda666f5
+_electronversion=29
+_nodeversion=20
 pkgrel=1
 pkgdesc="A client software designed specifically for editing blog articles and managing blog content that supports Hexo!."
 arch=('any')
@@ -25,17 +26,24 @@ source=(
     "${pkgname%-git}.sh"
 )
 sha256sums=('SKIP'
-            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
+            '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe')
 pkgver() {
     cd "${srcdir}/${pkgname//-/.}"
-    #git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
-    printf "%s" "$(git describe --tags | sed 's/\w\+\///g;s/\([^-]*-g\)/r\1/;s/-/./g;s/v//g')"
+    git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
+    #printf "%s" "$(git describe --tags | sed 's/\w\+\///g;s/\([^-]*-g\)/r\1/;s/-/./g;s/v//g')"
+}
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install "${_nodeversion}"
+    nvm use "${_nodeversion}"
 }
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-git}|g" \
         -e "s|@runname@|app.asar|g" \
         -i "${srcdir}/${pkgname%-git}.sh"
+    _ensure_local_nvm
     gendesk -q -f -n --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U"
     cd "${srcdir}/${pkgname//-/.}"
     export npm_config_build_from_source=true
@@ -46,7 +54,7 @@ build() {
     export ELECTRONVERSION="${_electronversion}"
     export npm_config_disturl=https://electronjs.org/headers
     HOME="${srcdir}/.electron-gyp"
-    sed '27,30d' -i forge.config.cjs
+    sed '/MakerRpm/d' -i forge.config.ts
     npm install
     npm run build
     npm run forge:package
diff --git a/hexopress.sh b/hexopress.sh
index f9ced1432cfc..86cb3dc6a9bf 100644
--- a/hexopress.sh
+++ b/hexopress.sh
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/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