fix errors

3 files changed, 18 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 471f04e03054..3a481609d707 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = amcrest-desktop-bin
 	pkgdesc = A simple Desktop application for Amcrest NVR, built using Electron.js
 	pkgver = 1.0.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/mikepruett3/amcrest-desktop
 	arch = x86_64
 	license = MIT
-	depends = bash
 	depends = electron14
 	provides = amcrest-desktop=1.0.1
 	conflicts = amcrest-desktop
@@ -14,6 +13,6 @@ pkgbase = amcrest-desktop-bin
 	source = amcrest-desktop.sh
 	sha256sums = e25fe0802fc45f037b1581641be4fba22e9233d890b3bc1be8dcf6c273a913bf
 	sha256sums = 82f04c17c97a90cb676f7eec2bdeca09cfff8a6779b310226d8e750a70abad79
-	sha256sums = 21777a2e3342c63d0e617e495e8aa162ada70f87523b3b2295723ccbbc8308fd
+	sha256sums = d55bb3160b4feb2b1bc23adc412e264c3c588e3afbdf694e9a6feea4da797469
 
 pkgname = amcrest-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index 65ddd7ae7f57..4ec3ff5f868f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,32 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=amcrest-desktop-bin
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple Desktop application for Amcrest NVR, built using Electron.js"
 arch=('x86_64')
 url="https://github.com/mikepruett3/amcrest-desktop"
 license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron14')
-source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
+depends=(
+    'electron14'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
     "LICENSE::https://raw.githubusercontent.com/mikepruett3/amcrest-desktop/v${pkgver}/LICENSE"
-    "${pkgname%-bin}.sh")
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('e25fe0802fc45f037b1581641be4fba22e9233d890b3bc1be8dcf6c273a913bf'
             '82f04c17c97a90cb676f7eec2bdeca09cfff8a6779b310226d8e750a70abad79'
-            '21777a2e3342c63d0e617e495e8aa162ada70f87523b3b2295723ccbbc8308fd')
-prepare() {
+            'd55bb3160b4feb2b1bc23adc412e264c3c588e3afbdf694e9a6feea4da797469')
+build() {
     bsdtar -xf "${srcdir}/data.tar.zst"
     sed "s|${pkgname%-bin} %U|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/usr/lib/${pkgname%-bin}/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+    install -Dm644 "${srcdir}/usr/lib/${pkgname%-bin}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/usr/lib/${pkgname%-bin}/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/swiftshader"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/usr/share/pixmaps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
     install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/amcrest-desktop.sh b/amcrest-desktop.sh
index 0bddc1b25213..ca9983959d35 100644
--- a/amcrest-desktop.sh
+++ b/amcrest-desktop.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron14
-_ASAR=/opt/amcrest-desktop/amcrest-desktop.asar
+APPDIR="/usr/lib/amcrest-desktop"
+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