fix errors

3 files changed, 48 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4021a904dcdb..1106eb32d3a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = frontimer
 	pkgdesc = Desktop timer application always displayed in the forefront of the screen
 	pkgver = 0.1.17
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/seita1996/frontimer
 	arch = any
 	license = MIT
 	makedepends = gendesk
-	makedepends = nodejs>=18.12.1
+	makedepends = nvm
 	makedepends = npm
 	makedepends = yarn
-	depends = bash
+	makedepends = git
 	depends = electron25
 	conflicts = frontimer
-	source = frontimer-0.1.17.zip::https://github.com/seita1996/frontimer/archive/refs/tags/v0.1.17.zip
+	source = frontimer-0.1.17::git+https://github.com/seita1996/frontimer.git#tag=v0.1.17
 	source = frontimer.sh
-	sha256sums = 745ae301f254db45975f6d76c8b631820871bba8002544d21a2135cd3e092d57
-	sha256sums = 1af4ec991bdd32eb41ad9b69256d2d44d02aa4cb09e6ce124b57771cb9f52e3b
+	sha256sums = SKIP
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = frontimer
diff --git a/PKGBUILD b/PKGBUILD
index 43fe6e50503d..e54ae98a3cf6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,50 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=frontimer
 pkgver=0.1.17
-pkgrel=1
+_electronversion=25
+pkgrel=2
 pkgdesc="Desktop timer application always displayed in the forefront of the screen"
 arch=('any')
 url="https://github.com/seita1996/frontimer"
 license=('MIT')
 conflicts=("${pkgname}")
-depends=('bash' 'electron25')
-makedepends=('gendesk' 'nodejs>=18.12.1' 'npm' 'yarn')
-source=("${pkgname}-${pkgver}.zip::${url}/archive/refs/tags/v${pkgver}.zip"
-    "${pkgname%-bin}.sh")
-sha256sums=('745ae301f254db45975f6d76c8b631820871bba8002544d21a2135cd3e092d57'
-            '1af4ec991bdd32eb41ad9b69256d2d44d02aa4cb09e6ce124b57771cb9f52e3b')
-prepare() {
-    gendesk -f -n -q --categories "Utility" --name "${pkgname}" --exec "${pkgname}"
+depends=(
+    "electron${_electronversion}"
+)
+makedepends=(
+    'gendesk'
+    'nvm'
+    'npm'
+    'yarn'
+    'git'
+)
+source=(
+    "${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver}"
+    "${pkgname%-bin}.sh"
+)
+sha256sums=('SKIP'
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install 18
+    nvm use 18
 }
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname}.sh"
+    _ensure_local_nvm
+    gendesk -f -n -q --categories "Utility" --name "${pkgname}" --exec "${pkgname}"
     cd "${srcdir}/${pkgname}-${pkgver}"
-    yarn install
+    yarn install --cache-folder "${srcdir}/.yarn_cache"
     yarn build
-    yarn electron-builder --linux AppImage
+    yarn ebuilder:linux
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/src/assets/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/frontimer.sh b/frontimer.sh
index 8e938c97d980..2ec4412e5c4f 100644
--- a/frontimer.sh
+++ b/frontimer.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron25
-_ASAR="/opt/frontimer/resources/app.asar"
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
 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