fix errors

3 files changed, 26 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28e3bbb30535..a5cd52a6c677 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
 pkgbase = before-dawn
 	pkgdesc = A desktop screensaver app using web technologies
 	pkgver = 0.26.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/muffinista/before-dawn
 	arch = any
 	license = MIT
 	makedepends = npm
 	makedepends = gendesk
-	makedepends = asar
 	makedepends = nodejs>=18.16.1
-	depends = bash
 	depends = electron26
 	depends = hicolor-icon-theme
 	conflicts = before-dawn
diff --git a/PKGBUILD b/PKGBUILD
index 2c37c5273562..107f4454648c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,47 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=before-dawn
 pkgver=0.26.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A desktop screensaver app using web technologies"
 arch=('any')
 url="https://github.com/muffinista/before-dawn"
 license=('MIT')
 conflicts=("${pkgname}")
-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")
+depends=(
+    'electron26'
+    'hicolor-icon-theme'
+)
+makedepends=(
+    'npm'
+    'gendesk'
+    'nodejs>=18.16.1'
+)
+source=(
+    "${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
+    "${pkgname}.sh"
+)
 sha256sums=('15b46edeb6bf3021bb2f4928dad58f55c1aede54c43fba2272734ac9b6aa0003'
             '86743fe625d8342fb25bb53d69d611b255c09f9fffbf6ed84413116a494bd46d')
-prepare() {
-    gendesk -q -f -n --categories "Utility" --name "Before Dawn" --exec "${pkgname}"
-}
 build() {
+    gendesk -q -f -n --categories "Utility" --name "Before Dawn" --exec "${pkgname}"
     cd "${srcdir}/${pkgname}-${pkgver}"
     npm ci
     sed '141,155d' -i package.json
     sed '124,139d' -i package.json
     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"
+    cd "${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}/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}-${pkgver}/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
+    cp -r "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm755 -d "${pkgdir}/usr/lib/${pkgname}/"{output,data/savers}
+    cp -r "${srcdir}/${pkgname}-${pkgver}/output/system-savers" "${pkgdir}/usr/lib/${pkgname}/output"
+    cp -r "${srcdir}/${pkgname}-${pkgver}/output/system-savers" "${pkgdir}/usr/lib/${pkgname}/data/savers"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
     for _icons in 16 32 48 64 128 256 512 1024;do
         install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/.icon-set/icon_${_icons}.png" \
diff --git a/before-dawn.sh b/before-dawn.sh
index 43420b81211f..e5b73c086383 100644
--- a/before-dawn.sh
+++ b/before-dawn.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron26
-_ASAR=/opt/before-dawn/resources/app.asar
+APPDIR="/usr/lib/before-dawn"
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else