fix errors

3 files changed, 27 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd5d6603bb3e..53bf83f9302a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = borg-explorer-bin
 	pkgdesc = An electron-based UI for exploring Borg Backup repositories
 	pkgver = 0.0.8
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/Netruk44/borg-repository-explorer
 	arch = x86_64
 	license = MIT
 	makedepends = gendesk
-	makedepends = asar
-	depends = bash
 	depends = electron22
 	provides = borg-explorer-0.0.8
 	conflicts = borg-explorer
 	source = borg-explorer-0.0.8.zip::https://github.com/Netruk44/borg-repository-explorer/releases/download/v0.0.8/Borg.Explorer-linux-x64-0.0.8.zip
+	source = LICENSE.md::https://raw.githubusercontent.com/Netruk44/borg-repository-explorer/v0.0.8/license.md
 	source = borg-explorer.sh
 	sha256sums = af6cc3b6689ffafe8a3a8abebabe5d04d351a23aa9fb3bb6567f2f12b65f1353
-	sha256sums = 82f25d176514d371bda04d443043af35e0cb68337f5dd96b45a43126e175c0f2
+	sha256sums = 71d8ae0fab83a418158860542b02d9df28ef74b599b75e57ac2057bdf478aaaa
+	sha256sums = 2497614ffa83c0f2ff68aa43332e2f07f7150a43a2562fcc0ff0e0d3f048b7c9
 
 pkgname = borg-explorer-bin
diff --git a/PKGBUILD b/PKGBUILD
index ee13898ee64c..7f98fb58650d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,35 @@
 pkgname=borg-explorer-bin
 _appname="Borg Explorer"
 pkgver=0.0.8
-pkgrel=4
+pkgrel=5
 pkgdesc="An electron-based UI for exploring Borg Backup repositories"
 arch=("x86_64")
 url="https://github.com/Netruk44/borg-repository-explorer"
 license=('MIT')
 provides=("${pkgname%-bin}-${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron22')
-makedepends=('gendesk' 'asar')
-source=("${pkgname%-bin}-${pkgver}.zip::${url}/releases/download/v${pkgver}/${_appname// /.}-linux-x64-${pkgver}.zip"
-    "${pkgname%-bin}.sh")
+depends=(
+    'electron22'
+)
+makedepends=(
+    'gendesk'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.zip::${url}/releases/download/v${pkgver}/${_appname// /.}-linux-x64-${pkgver}.zip"
+    "LICENSE.md::https://raw.githubusercontent.com/Netruk44/borg-repository-explorer/v${pkgver}/license.md"
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('af6cc3b6689ffafe8a3a8abebabe5d04d351a23aa9fb3bb6567f2f12b65f1353'
-            '82f25d176514d371bda04d443043af35e0cb68337f5dd96b45a43126e175c0f2')
-prepare() {
-    asar pack "${srcdir}/${_appname}-linux-x64/resources/app" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
-    gendesk -f -n --categories "Utility" --name "${_appname}" --exec "${pkgname%-bin}"
+            '71d8ae0fab83a418158860542b02d9df28ef74b599b75e57ac2057bdf478aaaa'
+            '2497614ffa83c0f2ff68aa43332e2f07f7150a43a2562fcc0ff0e0d3f048b7c9')
+build() {
+    gendesk -q -f -n --categories "Utility" --name "${_appname}" --exec "${pkgname%-bin}"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/${_appname}-linux-x64/LICENSE"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm755 -d "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/${_appname}-linux-x64/resources/app" "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/${_appname}-linux-x64/resources/app/images/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
     install -Dm644 "${srcdir}/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
+    install -Dm644 "${srcdir}/LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/borg-explorer.sh b/borg-explorer.sh
index 89163565dbc2..18c6dfefd2c4 100644
--- a/borg-explorer.sh
+++ b/borg-explorer.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron22
-_ASAR="/opt/borg-explorer/borg-explorer.asar"
+APPDIR="/usr/lib/borg-explorer"
+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