fix errors

3 files changed, 19 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eebb1a57f3f3..a690e1dcb923 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = simple-irc-client-bin
 	pkgdesc = Desktop clients for Simple Irc Client
 	pkgver = 0.1.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/Simple-Irc-Client/desktop
 	arch = x86_64
 	license = AGPL3
-	makedepends = asar
 	depends = bash
 	depends = electron25
 	provides = simple-irc-client=0.1.1
@@ -13,6 +12,6 @@ pkgbase = simple-irc-client-bin
 	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 = 6d0ab680e8fe80bb5f3b954bb68df76100a4542d2d782a32c245b808ff230b5d
+	sha256sums = aa4eb12e6198db57c773928afcd0114b6167a6c99bd0eb1fa6b9cff800f1cb0d
 
 pkgname = simple-irc-client-bin
diff --git a/PKGBUILD b/PKGBUILD
index f933e8aaa36a..a840eef08895 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,32 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=simple-irc-client-bin
 pkgver=0.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Desktop clients for Simple Irc Client"
 arch=('x86_64')
 url="https://github.com/Simple-Irc-Client/desktop"
 license=('AGPL3')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron25')
-makedepends=('asar')
-source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
-    "${pkgname%-bin}.sh")
+depends=(
+    'bash'
+    'electron25'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('8e6a71e380c73061185c8e0c206999a733df3b4be4a4c8c01a9e444c050eb6fc'
-            '6d0ab680e8fe80bb5f3b954bb68df76100a4542d2d782a32c245b808ff230b5d')
-prepare() {
+            'aa4eb12e6198db57c773928afcd0114b6167a6c99bd0eb1fa6b9cff800f1cb0d')
+build() {
     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() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/${pkgname%-bin}.asar" -t "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm755 -d "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/usr/lib/${pkgname%-bin}/resources/app" "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/usr/share/pixmaps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
 }
\ No newline at end of file
diff --git a/simple-irc-client.sh b/simple-irc-client.sh
index 537c132abf77..b9f111afd04b 100644
--- a/simple-irc-client.sh
+++ b/simple-irc-client.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron25
-_ASAR="/opt/simple-irc-client/simple-irc-client.asar"
+APPDIR="/usr/lib/simple-irc-client"
+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