fix errors

3 files changed, 27 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53bf83f9302a..857f730b5e3c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = borg-explorer-bin
 	pkgdesc = An electron-based UI for exploring Borg Backup repositories
 	pkgver = 0.0.8
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/Netruk44/borg-repository-explorer
 	arch = x86_64
 	license = MIT
@@ -10,10 +10,10 @@ pkgbase = borg-explorer-bin
 	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 = LICENSE-0.0.8.md::https://raw.githubusercontent.com/Netruk44/borg-repository-explorer/v0.0.8/license.md
 	source = borg-explorer.sh
 	sha256sums = af6cc3b6689ffafe8a3a8abebabe5d04d351a23aa9fb3bb6567f2f12b65f1353
 	sha256sums = 71d8ae0fab83a418158860542b02d9df28ef74b599b75e57ac2057bdf478aaaa
-	sha256sums = 2497614ffa83c0f2ff68aa43332e2f07f7150a43a2562fcc0ff0e0d3f048b7c9
+	sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
 
 pkgname = borg-explorer-bin
diff --git a/PKGBUILD b/PKGBUILD
index 7f98fb58650d..4c432edd9cd4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,8 @@
 pkgname=borg-explorer-bin
 _appname="Borg Explorer"
 pkgver=0.0.8
-pkgrel=5
+_electronversion=22
+pkgrel=6
 pkgdesc="An electron-based UI for exploring Borg Backup repositories"
 arch=("x86_64")
 url="https://github.com/Netruk44/borg-repository-explorer"
@@ -10,20 +11,24 @@ license=('MIT')
 provides=("${pkgname%-bin}-${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
-    'electron22'
+    "electron${_electronversion}"
 )
 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"
+    "LICENSE-${pkgver}.md::https://raw.githubusercontent.com/Netruk44/borg-repository-explorer/v${pkgver}/license.md"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('af6cc3b6689ffafe8a3a8abebabe5d04d351a23aa9fb3bb6567f2f12b65f1353'
             '71d8ae0fab83a418158860542b02d9df28ef74b599b75e57ac2057bdf478aaaa'
-            '2497614ffa83c0f2ff68aa43332e2f07f7150a43a2562fcc0ff0e0d3f048b7c9')
+            '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|g" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     gendesk -q -f -n --categories "Utility" --name "${_appname}" --exec "${pkgname%-bin}"
 }
 package() {
@@ -32,5 +37,5 @@ package() {
     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}"
+    install -Dm644 "${srcdir}/LICENSE-${pkgver}.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
 }
\ No newline at end of file
diff --git a/borg-explorer.sh b/borg-explorer.sh
index 18c6dfefd2c4..c77c53567639 100644
--- a/borg-explorer.sh
+++ b/borg-explorer.sh
@@ -1,11 +1,17 @@
-#!/bin/bash
-_ELECTRON=/usr/bin/electron22
-APPDIR="/usr/lib/borg-explorer"
-export PATH="${APPDIR}:${PATH}"
-#export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app"
+#!/bin/sh
+set -e
+_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
+    exit
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+    exit
 fi
\ No newline at end of file