fix errors

3 files changed, 14 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60c59f59ccda..8a962b47ce27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = barklarm-bin
 	pkgdesc = Displays the status of projects as an item in the tray menu bar
 	pkgver = 1.11.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.barklarm.com
 	arch = x86_64
-	license = Apache
+	license = Apache-2.0
 	depends = electron25
+	depends = nodejs
 	provides = barklarm=1.11.4
 	conflicts = barklarm
 	source = barklarm-1.11.4.deb::https://github.com/Barklarm/barklarm-app/releases/download/v1.11.4/barklarm_1.11.4_amd64.deb
 	source = barklarm.sh
 	sha256sums = 045397c3696f9b583003fcafa3c7c41e3a49e3ec04f6590811d2ab5798ddf02c
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = barklarm-bin
diff --git a/PKGBUILD b/PKGBUILD
index 328bf360c12c..b6683e99bd8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,30 @@
 pkgname=barklarm-bin
 pkgver=1.11.4
 _electronversion=25
-pkgrel=2
+pkgrel=3
 pkgdesc="Displays the status of projects as an item in the tray menu bar"
 arch=('x86_64')
 url="https://www.barklarm.com"
 _ghurl="https://github.com/Barklarm/barklarm-app"
-license=('Apache')
+license=('Apache-2.0')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
     "electron${_electronversion}"
+    'nodejs'
 )
 source=(
     "${pkgname%-bin}-${pkgver}.deb::${_ghurl}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('045397c3696f9b583003fcafa3c7c41e3a49e3ec04f6590811d2ab5798ddf02c'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
-        -e "s|@appasar@|app|g" \
+        -e "s|@runname@|app|g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
-    bsdtar -xf "${srcdir}/data.tar.zst"
+    bsdtar -xf "${srcdir}/data."*
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
diff --git a/barklarm.sh b/barklarm.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/barklarm.sh
+++ b/barklarm.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 set -e
 _APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_ASAR}" "$@"
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit
\ No newline at end of file
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file