fix errors

3 files changed, 19 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35e51f2f17cd..259338767b05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = arctis-monitor-bin
 	pkgdesc = Electron Tray application to view Battery Level of Arctis Headsets
 	pkgver = 0.0.12
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/richrace/arctis-monitor
 	arch = x86_64
 	license = MIT
-	makedepends = asar
-	depends = bash
 	depends = electron26
+	depends = libusb
 	provides = arctis-monitor=0.0.12
 	conflicts = arctis-monitor
 	source = arctis-monitor-0.0.12.deb::https://github.com/richrace/arctis-monitor/releases/download/v0.0.12/arctis-monitor_0.0.12_amd64.deb
@@ -15,6 +14,6 @@ pkgbase = arctis-monitor-bin
 	source = arctis-monitor.sh
 	sha256sums = 35f546aa8a23eb79527a1ff489fa9ab9d1412f69fe2b15e75e43efcfa1e844e9
 	sha256sums = bd5c70f61f5c60d42bffbadd12de9a6e0f3272afe8d869e7251d4f0c6d67025d
-	sha256sums = 722f00c09b6b3a34315d7349d5e4bbf0bf15459e239716c3ad60e50abca4cd14
+	sha256sums = 8072d2781be81fe8c31f75111ea190a0b50289fff2b89afaa947fd51c01252b3
 
 pkgname = arctis-monitor-bin
diff --git a/PKGBUILD b/PKGBUILD
index b477a0543aee..01f8c600817f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,25 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=arctis-monitor-bin
 pkgver=0.0.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Electron Tray application to view Battery Level of Arctis Headsets"
 arch=("x86_64")
 url="https://github.com/richrace/arctis-monitor"
 license=("MIT")
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron26')
-makedepends=('asar')
-source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
+depends=(
+    'electron26'
+    'libusb'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
     "LICENSE::https://raw.githubusercontent.com/richrace/arctis-monitor/v${pkgver}/LICENSE.md"
-    "${pkgname%-bin}.sh")
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('35f546aa8a23eb79527a1ff489fa9ab9d1412f69fe2b15e75e43efcfa1e844e9'
             'bd5c70f61f5c60d42bffbadd12de9a6e0f3272afe8d869e7251d4f0c6d67025d'
-            '722f00c09b6b3a34315d7349d5e4bbf0bf15459e239716c3ad60e50abca4cd14')
+            '8072d2781be81fe8c31f75111ea190a0b50289fff2b89afaa947fd51c01252b3')
 build() {
     bsdtar -xf "${srcdir}/data.tar.zst"
     sed "s| %U||g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
@@ -23,7 +27,8 @@ build() {
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
+    install -Dm755 -d "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/usr/lib/${pkgname%-bin}/resources/app" "${pkgdir}/usr/lib/${pkgname%-bin}"
     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/arctis-monitor.sh b/arctis-monitor.sh
index ffc2e054c3a2..f03fd8fc290e 100644
--- a/arctis-monitor.sh
+++ b/arctis-monitor.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron26
-_ASAR="/opt/arctis-monitor/resources/app.asar"
+APPDIR="/usr/lib/arctis-monitor"
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else