fix errors

3 files changed, 20 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a690e1dcb923..95b945277693 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = simple-irc-client-bin
 	pkgdesc = Desktop clients for Simple Irc Client
 	pkgver = 0.1.1
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/Simple-Irc-Client/desktop
 	arch = x86_64
 	license = AGPL3
-	depends = bash
 	depends = electron25
 	provides = simple-irc-client=0.1.1
 	conflicts = simple-irc-client
 	source = simple-irc-client-0.1.1.deb::https://github.com/Simple-Irc-Client/desktop/releases/download/v0.1.1/simple-irc-client_0.1.1_amd64.deb
 	source = simple-irc-client.sh
 	sha256sums = 8e6a71e380c73061185c8e0c206999a733df3b4be4a4c8c01a9e444c050eb6fc
-	sha256sums = aa4eb12e6198db57c773928afcd0114b6167a6c99bd0eb1fa6b9cff800f1cb0d
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = simple-irc-client-bin
diff --git a/PKGBUILD b/PKGBUILD
index a840eef08895..62bbb76d3076 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=simple-irc-client-bin
 pkgver=0.1.1
-pkgrel=4
+_electronversion=25
+pkgrel=5
 pkgdesc="Desktop clients for Simple Irc Client"
 arch=('x86_64')
 url="https://github.com/Simple-Irc-Client/desktop"
@@ -9,18 +10,20 @@ license=('AGPL3')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
-    'bash'
-    'electron25'
+    "electron${_electronversion}"
 )
 source=(
     "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('8e6a71e380c73061185c8e0c206999a733df3b4be4a4c8c01a9e444c050eb6fc'
-            'aa4eb12e6198db57c773928afcd0114b6167a6c99bd0eb1fa6b9cff800f1cb0d')
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data.tar.zst"
-    asar pack "${srcdir}/usr/lib/${pkgname%-bin}/resources/app" "${srcdir}/${pkgname%-bin}.asar"
     sed "s| %U||g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
diff --git a/simple-irc-client.sh b/simple-irc-client.sh
index b9f111afd04b..2ec4412e5c4f 100644
--- a/simple-irc-client.sh
+++ b/simple-irc-client.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron25
-APPDIR="/usr/lib/simple-irc-client"
-export PATH="${APPDIR}:${PATH}"
-#export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app"
+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