fix errors

3 files changed, 18 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b37318dbf33..a43401805ad2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = frontimer
 	pkgdesc = Desktop timer application always displayed in the forefront of the screen
 	pkgver = 0.1.15
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/seita1996/frontimer
 	arch = any
 	license = MIT
 	makedepends = gendesk
 	makedepends = nodejs>=18.12.1
 	makedepends = npm
+	makedepends = yarn
 	depends = bash
 	depends = electron23
 	conflicts = frontimer
-	source = frontimer-0.1.15.tar.gz::https://github.com/seita1996/frontimer/archive/refs/tags/v0.1.15.tar.gz
+	source = frontimer-0.1.15.zip::https://github.com/seita1996/frontimer/archive/refs/tags/v0.1.15.zip
 	source = frontimer.sh
-	sha256sums = 2c06cfd38ee18868145b0f97ae2ebbd22cfab92cab66112e22418b87d41d7d3f
-	sha256sums = a0f4809165f3f52ba80973d379e9f0e5275d29ae946367b8d597fdbfdd2d8dc1
+	sha256sums = 62c16c0ba0cf123b4bcef772e49a4da401c47f91cdc84a7f34be332482a75391
+	sha256sums = 9b8b0a2e8246704e802fb23238ee2bda31cbfb0f0557796cf528102f881ad325
 
 pkgname = frontimer
diff --git a/PKGBUILD b/PKGBUILD
index c7fe8bb2cb1c..3ae78b7eaf8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,31 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=frontimer
 pkgver=0.1.15
-pkgrel=1
+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' 'electron23')
-makedepends=('gendesk' 'nodejs>=18.12.1' 'npm')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
+makedepends=('gendesk' 'nodejs>=18.12.1' 'npm' 'yarn')
+source=("${pkgname}-${pkgver}.zip::${url}/archive/refs/tags/v${pkgver}.zip"
     "${pkgname%-bin}.sh")
-sha256sums=('2c06cfd38ee18868145b0f97ae2ebbd22cfab92cab66112e22418b87d41d7d3f'
-            'a0f4809165f3f52ba80973d379e9f0e5275d29ae946367b8d597fdbfdd2d8dc1')
+sha256sums=('62c16c0ba0cf123b4bcef772e49a4da401c47f91cdc84a7f34be332482a75391'
+            '9b8b0a2e8246704e802fb23238ee2bda31cbfb0f0557796cf528102f881ad325')
+prepare() {
+    gendesk -f -n -q --categories "Utility" --name "${pkgname}" --exec "${pkgname}"
+}
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-    npm install
-    npm run build
-    npx electron-builder --linux AppImage
+    yarn install
+    yarn build
+    yarn electron-builder --linux AppImage
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/src/assets/ft-logo.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    gendesk -f -n --categories "Utility" --name "${pkgname}" --exec "${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/frontimer.sh b/frontimer.sh
index 8c20e6657544..72b3dccebe28 100644
--- a/frontimer.sh
+++ b/frontimer.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron23
-_ASAR="/opt/frontimer/frontimer.asar"
+_ASAR="/opt/frontimer/resources/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else