fix errors

3 files changed, 31 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7598fe350541..28e3bbb30535 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = before-dawn
 	pkgdesc = A desktop screensaver app using web technologies
 	pkgver = 0.26.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/muffinista/before-dawn
 	arch = any
 	license = MIT
 	makedepends = npm
-	makedepends = nodejs>=18.15.0
 	makedepends = gendesk
+	makedepends = asar
+	makedepends = nodejs>=18.16.1
 	depends = bash
 	depends = electron26
-	depends = python
-	depends = glibc
-	depends = gcc-libs
+	depends = hicolor-icon-theme
 	conflicts = before-dawn
 	source = before-dawn-0.26.0.tar.gz::https://github.com/muffinista/before-dawn/archive/refs/tags/v0.26.0.tar.gz
 	source = before-dawn.sh
 	sha256sums = 15b46edeb6bf3021bb2f4928dad58f55c1aede54c43fba2272734ac9b6aa0003
-	sha256sums = 274a2ed73ad2a6eddb9ad4b6f7c6e0cfd42d60ae4222a01077ec654f3f9d16c8
+	sha256sums = 86743fe625d8342fb25bb53d69d611b255c09f9fffbf6ed84413116a494bd46d
 
 pkgname = before-dawn
diff --git a/PKGBUILD b/PKGBUILD
index d747fca40ee3..2c37c5273562 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,46 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=before-dawn
 pkgver=0.26.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A desktop screensaver app using web technologies"
 arch=('any')
 url="https://github.com/muffinista/before-dawn"
 license=('MIT')
 conflicts=("${pkgname}")
-depends=('bash' 'electron26' 'python' 'glibc' 'gcc-libs')
-makedepends=('npm' 'nodejs>=18.15.0' 'gendesk')
+depends=('bash' 'electron26' 'hicolor-icon-theme')
+makedepends=('npm' 'gendesk' 'asar' 'nodejs>=18.16.1')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
     "${pkgname}.sh")
 sha256sums=('15b46edeb6bf3021bb2f4928dad58f55c1aede54c43fba2272734ac9b6aa0003'
-            '274a2ed73ad2a6eddb9ad4b6f7c6e0cfd42d60ae4222a01077ec654f3f9d16c8')
+            '86743fe625d8342fb25bb53d69d611b255c09f9fffbf6ed84413116a494bd46d')
+prepare() {
+    gendesk -q -f -n --categories "Utility" --name "Before Dawn" --exec "${pkgname}"
+}
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     npm ci
     sed '141,155d' -i package.json
     sed '124,139d' -i package.json
-    npm run dist
+    sed "s|deb|AppImage|g" -i package.json
+    npm run pack
+    asar e "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar" "${srcdir}/app.asar.unpacked"
+    cp -r "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar.unpacked" "${srcdir}"
+    asar p "${srcdir}/app.asar.unpacked" "${srcdir}/app.asar"
+    1cd "${srcdir}/${pkgname}-${pkgver}/dist/.icon-set"
+    cp icon_16x16.png icon_16.png
+    cp icon_48x48.png icon_48.png
+    cp icon_128x128.png icon_128.png
 }
 package() {
-    install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/opt/${pkgname}/${pkgname}"
-    cp -r  "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/"* "${pkgdir}/opt/${pkgname}"
-    gendesk -f -n --icon "${pkgname}" --categories "Utility" --name "Before Dawn" --exec "/opt/${pkgname}/${pkgname}"
+    install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 "${srcdir}/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
+    install -Dm755 -d "${pkgdir}/opt/${pkgname}/resources/"{output,data/savers}
+    cp -r "${srcdir}/${pkgname}-${pkgver}/output/system-savers" "${pkgdir}/opt/${pkgname}/resources/output"
+    cp -r "${srcdir}/${pkgname}-${pkgver}/output/system-savers" "${pkgdir}/opt/${pkgname}/resources/data/savers"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/assets/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
+    for _icons in 16 32 48 64 128 256 512 1024;do
+        install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/.icon-set/icon_${_icons}.png" \
+            "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname}.png"
+    done
     install -Dm644  "${srcdir}/${pkgname}-${pkgver}/LICENSE.txt" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/before-dawn.sh b/before-dawn.sh
index b9eeb7088268..43420b81211f 100644
--- a/before-dawn.sh
+++ b/before-dawn.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron26
-_ASAR=/opt/before-dawn/app.asar
+_ASAR=/opt/before-dawn/resources/app.asar
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else