fix errors

3 files changed, 11 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e73b1eab746..1422fcb71c50 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,18 @@
 pkgbase = walc-bin
 	pkgdesc = An unofficial WhatsApp Desktop client for linux systems.
 	pkgver = 0.3.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/WAClient/WALC
 	arch = x86_64
 	license = GPL-3.0-only
-	makedepends = squashfuse
-	makedepends = asar
-	makedepends = npm
-	depends = electron20
+	makedepends = fuse2
+	depends = electron20-bin
 	depends = nodejs
-	depends = lib32-glibc
 	provides = walc=0.3.3
 	conflicts = walc
 	source = walc-0.3.3.AppImage::https://github.com/WAClient/WALC/releases/download/v0.3.3/WALC-0.3.3.AppImage
 	source = walc.sh
 	sha256sums = 186276bd9806c0ae9e93d733990f50375b02cc480164a94ee067ede56934e55e
-	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
+	sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe
 
 pkgname = walc-bin
diff --git a/PKGBUILD b/PKGBUILD
index 2959501d4501..6c6109ea51a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=walc-bin
 _pkgname=WALC
 pkgver=0.3.3
 _electronversion=20
-pkgrel=1
+pkgrel=2
 pkgdesc="An unofficial WhatsApp Desktop client for linux systems."
 arch=('x86_64')
 url="https://github.com/WAClient/WALC"
@@ -11,21 +11,18 @@ license=('GPL-3.0-only')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
-    "electron${_electronversion}"
+    "electron${_electronversion}-bin"
     'nodejs'
-    'lib32-glibc'
 )
 makedepends=(
-    'squashfuse'
-    'asar'
-    'npm'
+    'fuse2'
 )
 source=(
     "${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/v${pkgver}/${_pkgname}-${pkgver}.AppImage"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('186276bd9806c0ae9e93d733990f50375b02cc480164a94ee067ede56934e55e'
-            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
+            '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
@@ -35,14 +32,10 @@ build() {
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
     sed "s|AppRun --no-sandbox|${pkgname%-bin}|g;s|Social|Network|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
     find "${srcdir}/squashfs-root/resources" -type d -exec chmod 755 {} \;
-    asar e "${srcdir}/squashfs-root/resources/app.asar" "${srcdir}/app.asar.unpacked"
-    cd "${srcdir}/app.asar.unpacked"
-    npm add electron-devtools-installer
-    asar p "${srcdir}/app.asar.unpacked" "${srcdir}/app.asar"
 } 
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
     cp -r "${srcdir}/squashfs-root/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/squashfs-root/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
diff --git a/walc.sh b/walc.sh
index f9ced1432cfc..86cb3dc6a9bf 100644
--- a/walc.sh
+++ b/walc.sh
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 _APPDIR="/usr/lib/@appname@"
 _RUNNAME="${_APPDIR}/@runname@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
+export ELECTRON_FORCE_IS_PACKAGED=true
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then