fix errors

3 files changed, 34 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6086b7dc0070..80bcf5eb1386 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,23 @@
 pkgbase = electronim-bin
 	pkgdesc = Electron based multi IM (Instant Messaging) client
 	pkgver = 0.0.97
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/manusa/electronim
 	arch = x86_64
 	license = Apache
 	makedepends = squashfuse
-	depends = bash
 	depends = electron26
 	depends = libdbusmenu-glib
 	depends = gtk2
 	depends = dbus-glib
 	depends = gdk-pixbuf2
 	depends = libxext
-	depends = dbus
-	depends = glibc
 	depends = libx11
-	depends = glib2
 	provides = electronim=0.0.97
 	conflicts = electronim
 	source = electronim-0.0.97.AppImage::https://github.com/manusa/electronim/releases/download/v0.0.97/electronim-linux-x86_64.AppImage
 	source = electronim.sh
 	sha256sums = 1e61707419623f671f9a9347f415226bc672d1bbcd6ae61b0e5b5e7b2027919f
-	sha256sums = a05800116a19eca05613da2e5c8c9b3555906d9346865bf9fad2fc3cb67868f0
+	sha256sums = 69ba5c2a4361af98fba91a6aaa908accc7ff794973cfdaa69aa2c9a5117b9c1f
 
 pkgname = electronim-bin
diff --git a/PKGBUILD b/PKGBUILD
index 809791bd7f45..342e974bff81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,42 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=electronim-bin
 pkgver=0.0.97
-pkgrel=1
+_electronversion=26
+pkgrel=2
 pkgdesc="Electron based multi IM (Instant Messaging) client"
 arch=('x86_64')
 url="https://github.com/manusa/electronim"
 license=('Apache')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron26' 'libdbusmenu-glib' 'gtk2' 'dbus-glib' 'gdk-pixbuf2' 'libxext' 'dbus' 'glibc' 'libx11' 'glib2')
-makedepends=('squashfuse')
-source=("${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/v${pkgver}/${pkgname%-bin}-linux-${CARCH}.AppImage"
-    "${pkgname%-bin}.sh")
+depends=(
+    "electron${_electronversion}"
+    'libdbusmenu-glib'
+    'gtk2'
+    'dbus-glib'
+    'gdk-pixbuf2'
+    'libxext'
+    'libx11'
+)
+makedepends=(
+    'squashfuse'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/v${pkgver}/${pkgname%-bin}-linux-${CARCH}.AppImage"
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('1e61707419623f671f9a9347f415226bc672d1bbcd6ae61b0e5b5e7b2027919f'
-            'a05800116a19eca05613da2e5c8c9b3555906d9346865bf9fad2fc3cb67868f0')
-prepare() {
+            '69ba5c2a4361af98fba91a6aaa908accc7ff794973cfdaa69aa2c9a5117b9c1f')
+build() {
+    sed -i "s|@electronversion@|${_electronversion}|" "$srcdir/${pkgname%-bin}.sh"
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
     sed "s|AppRun --no-sandbox %U|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
-    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/opt/${pkgname%-bin}/usr/lib"
+    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/opt/${pkgname%-bin}/lib"
     install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
     install -Dm644 "${srcdir}/squashfs-root/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file
diff --git a/electronim.sh b/electronim.sh
index 5b003d276987..7edfae106714 100644
--- a/electronim.sh
+++ b/electronim.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron26
-APPDIR="/opt/electronim"
-export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/resources/app.asar"
+APPDIR="/usr/lib/electronim"
+export PATH="${APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 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