fix errors

3 files changed, 22 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31532810940f..7097038695b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = ptree-bin
 	pkgdesc = Design power tree and estimate consumptions
 	pkgver = 2.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://smariel.github.io/PTree
 	arch = x86_64
 	license = GPL3
 	makedepends = asar
 	makedepends = gendesk
-	depends = bash
 	depends = electron11
 	depends = hicolor-icon-theme
 	provides = ptree=2.2.0
@@ -15,6 +14,6 @@ pkgbase = ptree-bin
 	source = ptree-2.2.0.zip::https://github.com/smariel/PTree/releases/download/v2.2.0/PTree-linux.zip
 	source = ptree.sh
 	sha256sums = 4c15d219bd9e2c1a4aaa1da94931d19a133ddfd9d6178e5f21fdea97ab22f54c
-	sha256sums = 24fbd05573ab5f8cc13cc257a238d3c81bcb2a2c49aa8c32027ff40426515442
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = ptree-bin
diff --git a/PKGBUILD b/PKGBUILD
index 3b09fa210691..bb11ab104af9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,17 @@
 pkgname=ptree-bin
 _pkgname=PTree
 pkgver=2.2.0
-pkgrel=1
+_electronversion=11
+pkgrel=2
 pkgdesc="Design power tree and estimate consumptions"
 arch=("x86_64")
 url="https://smariel.github.io/PTree"
-_githuburl="https://github.com/smariel/PTree"
+_ghurl="https://github.com/smariel/PTree"
 license=("GPL3")
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
-    'bash'
-    'electron11'
+    "electron${_electronversion}"
     'hicolor-icon-theme'
 )
 makedepends=(
@@ -20,12 +20,16 @@ makedepends=(
     'gendesk'
 )
 source=(
-    "${pkgname%-bin}-${pkgver}.zip::${_githuburl}/releases/download/v${pkgver}/${_pkgname}-linux.zip"
+    "${pkgname%-bin}-${pkgver}.zip::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-linux.zip"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('4c15d219bd9e2c1a4aaa1da94931d19a133ddfd9d6178e5f21fdea97ab22f54c'
-            '24fbd05573ab5f8cc13cc257a238d3c81bcb2a2c49aa8c32027ff40426515442')
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     gendesk -q -f -n --categories "Utility" --name "${_pkgname}" --exec "${pkgname%-bin}"
     asar e "${srcdir}/${_pkgname}/resources/app.asar" "${srcdir}/app.asar.unpacked"
 }
diff --git a/ptree.sh b/ptree.sh
index bc5d0e75b33c..2ec4412e5c4f 100644
--- a/ptree.sh
+++ b/ptree.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron11
-APPDIR="/usr/lib/ptree"
-export PATH="${APPDIR}:${PATH}"
-export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app.asar"
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
 fi
\ No newline at end of file