fix errors

3 files changed, 12 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 55f99f9f4d6c..7cbfb3407938 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = clamav-desktop-bin
 	pkgdesc = Cross-platform Desktop GUI for ClamAV antivirus.
 	pkgver = 0.3.24
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/ivangabriele/clamav-desktop
 	arch = x86_64
 	license = AGPL-3.0-only
 	makedepends = asar
 	depends = clamav
-	depends = electron17
+	depends = electron17-bin
 	provides = clamav-desktop=0.3.24
 	conflicts = clamav-desktop
 	source = clamav-desktop-0.3.24.deb::https://github.com/ivangabriele/clamav-desktop/releases/download/v0.3.24/clamav-desktop-0.3.24.linux.amd64.deb
 	source = clamav-desktop.sh
 	sha256sums = c1bc5128d3c1c678347418ef195a81197e53af05157cb57d247f9f396078d568
-	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
+	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
 
 pkgname = clamav-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index 32dfe4ce4ddf..835740f764d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname="${_appname}-desktop-bin"
 _pkgname="ClamAV Desktop"
 pkgver=0.3.24
 _electronversion=17
-pkgrel=4
+pkgrel=5
 pkgdesc="Cross-platform Desktop GUI for ClamAV antivirus."
 arch=('x86_64')
 url="https://github.com/ivangabriele/clamav-desktop"
@@ -13,7 +13,7 @@ conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
 depends=(
     "${_appname}"
-    "electron${_electronversion}"
+    "electron${_electronversion}-bin"
 )
 makedepends=(
     'asar'
@@ -23,11 +23,12 @@ source=(
     "${pkgname%-bin}.sh"
 )
 sha256sums=('c1bc5128d3c1c678347418ef195a81197e53af05157cb57d247f9f396078d568'
-            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
+            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
         -e "s|@runname@|app.asar|g" \
+        -e "s|@options@||g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data."*
     asar e "${srcdir}/opt/${_pkgname}/resources/app.asar" "${srcdir}/app.asar.unpacked"
diff --git a/clamav-desktop.sh b/clamav-desktop.sh
index f9ced1432cfc..7ddcaab8d734 100644
--- a/clamav-desktop.sh
+++ b/clamav-desktop.sh
@@ -1,14 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 _APPDIR="/usr/lib/@appname@"
 _RUNNAME="${_APPDIR}/@runname@"
+_OPTIONS="@options@"
 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
-    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
 fi
\ No newline at end of file