fix errors

3 files changed, 49 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f05c19d87c03..3c8ac663c70f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = masscode-git
 	pkgdesc = A free and open source code snippets manager for developers
-	pkgver = v3.10.0.r1.g2e3500b
+	pkgver = v3.10.0.r2.gae9eb6b
 	pkgrel = 1
 	url = https://masscode.io/
 	arch = any
@@ -8,13 +8,12 @@ pkgbase = masscode-git
 	makedepends = npm
 	makedepends = pnpm>=8.0.0
 	makedepends = git
-	makedepends = nodejs>=16.15.0
+	makedepends = nvm
 	makedepends = gendesk
-	depends = bash
 	depends = electron16
-	source = masscode.git::git+https://github.com/massCodeIO/massCode.git
+	source = masscode::git+https://github.com/massCodeIO/massCode.git
 	source = masscode.sh
 	sha256sums = SKIP
-	sha256sums = d87bbdc2b2585aa2a572ed38898c94ae127e7ff6beab0aee26cd0624eea55bd6
+	sha256sums = 779f956756ea4f3f91df0fac3d9338d82fc8a74d54f9dea63abe305b8355420c
 
 pkgname = masscode-git
diff --git a/PKGBUILD b/PKGBUILD
index 20488e06dc73..80e592fbd957 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,60 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=masscode-git
 _pkgname=massCode
-pkgver=v3.10.0.r1.g2e3500b
+pkgver=v3.10.0.r2.gae9eb6b
+_electronversion=16
 pkgrel=1
 pkgdesc="A free and open source code snippets manager for developers"
 arch=('any')
 url="https://masscode.io/"
-_githuburl="https://github.com/massCodeIO/massCode"
+_ghurl="https://github.com/massCodeIO/massCode"
 license=('MIT')
-makedepends=('npm' 'pnpm>=8.0.0' 'git' 'nodejs>=16.15.0' 'gendesk')
-depends=('bash' 'electron16')
-source=("${pkgname//-/.}::git+${_githuburl}.git"
-    "${pkgname%-git}.sh")
+makedepends=(
+    'npm'
+    'pnpm>=8.0.0'
+    'git'
+    'nvm'
+    'gendesk'
+)
+depends=(
+    "electron${_electronversion}"
+)
+source=(
+    "${pkgname%-git}::git+${_ghurl}.git"
+    "${pkgname%-git}.sh"
+)
 sha256sums=('SKIP'
-            'd87bbdc2b2585aa2a572ed38898c94ae127e7ff6beab0aee26cd0624eea55bd6')
+            '779f956756ea4f3f91df0fac3d9338d82fc8a74d54f9dea63abe305b8355420c')
 pkgver() {
-    cd "${srcdir}/${pkgname//-/.}"
+    cd "${srcdir}/${pkgname%-git}"
     git describe --tags | sed 's/\w\+\///g;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
-prepare() {
-    gendesk -q -f -n --categories "Development;Utility" --name "${_pkgname}" --exec "${pkgname%-git}"
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install 16
+    nvm use 16
 }
 build() {
-    cd "${srcdir}/${pkgname//-/.}"
+    sed "s|@electronversion@|${_electronversion}|" -i "${srcdir}/${pkgname%-git}.sh"
+    gendesk -q -f -n --categories "Development" --name "${_pkgname}" --exec "${pkgname%-git}"
+    _ensure_local_nvm
+    cd "${srcdir}/${pkgname%-git}"
     sed "s|snap|AppImage|g" -i config/electron-builder.ts
+    pnpm config set store-dir "${srcdir}/.pnpm_store"
+    pnpm config set cache-dir "${srcdir}/.pnpm_cache"
+    pnpm config set link-workspace-packages true
+    export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    export ELECTRONVERSION="${_electronversion}"
+    export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
     pnpm install
     pnpm run build
     pnpm run release
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}"
-    install -Dm644 "${srcdir}/${pkgname//-/.}/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-git}/resources"
-    install -Dm644 "${srcdir}/${pkgname//-/.}/config/icons/256x256.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-git}.png"
+    install -Dm644 "${srcdir}/${pkgname%-git}/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-git}/resources"
+    install -Dm644 "${srcdir}/${pkgname%-git}/config/icons/256x256.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-git}.png"
     install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname//-/.}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname%-git}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/masscode.sh b/masscode.sh
index 1457e36cd80c..cdddcba7a48c 100644
--- a/masscode.sh
+++ b/masscode.sh
@@ -1,8 +1,12 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron16
-_ASAR="/opt/masscode/resources/app.asar"
+APPDIR="/usr/lib/masscode"
+export PATH="${APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "$APPDIR"
+    exec electron@electronversion@ ${_ASAR} "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "$APPDIR"
+    exec electron@electronversion@ ${_ASAR} --no-sandbox "$@"
 fi
\ No newline at end of file