fix errors

3 files changed, 13 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb3d6a7bfe38..0c4f711e24de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,18 @@
 pkgbase = fireblocks-recovery-utility-bin
 	pkgdesc = Recover Fireblocks assets and keys in a disaster, verify a Recovery Kit, or generate keys to set up a new Recovery Kit.
 	pkgver = 0.4.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.fireblocks.com/
 	arch = x86_64
-	license = GPL3
-	makedepends = squashfuse
+	license = GPL-3.0-only
+	makedepends = fuse2
 	depends = electron21
 	depends = hicolor-icon-theme
-	depends = dbus-glib
-	depends = libdbusmenu-glib
-	depends = gtk2
 	provides = fireblocks-recovery-utility=0.4.1
 	conflicts = fireblocks-recovery-utility
 	source = fireblocks-recovery-utility-bin-0.4.1.zip::https://github.com/fireblocks/recovery/releases/download/v0.4.1/Recovery.Utility.Ubuntu.x86-64.zip
 	source = fireblocks-recovery-utility.sh
 	sha256sums = b9829b24391a674403451c6c2c79cd536047325b77e303439cd0a69e00b754da
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = fireblocks-recovery-utility-bin
diff --git a/PKGBUILD b/PKGBUILD
index 53e987873434..3af2ad3919b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,34 +5,31 @@ _appname="Fireblocks Recovery Utility"
 pkgver=0.4.1
 _fileversion="${pkgver}"
 _electronversion=21
-pkgrel=2
+pkgrel=3
 pkgdesc="Recover Fireblocks assets and keys in a disaster, verify a Recovery Kit, or generate keys to set up a new Recovery Kit."
 arch=('x86_64')
 url="https://www.fireblocks.com/"
 _ghurl="https://github.com/fireblocks/recovery"
-license=('GPL3')
+license=('GPL-3.0-only')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
 depends=(
     "electron${_electronversion}"
     'hicolor-icon-theme'
-    'dbus-glib'
-    'libdbusmenu-glib'
-    'gtk2'
 )
 makedepends=(
-    'squashfuse'
+    'fuse2'
 )
 source=(
     "${pkgname}-${pkgver}.zip::${_ghurl}/releases/download/v${pkgver}/Recovery.Utility.Ubuntu.${CARCH//_/-}.zip"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('b9829b24391a674403451c6c2c79cd536047325b77e303439cd0a69e00b754da'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
-        -e "s|@appasar@|app.asar|g" \
+        -e "s|@runname@|app.asar|g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     chmod a+x "${srcdir}/${_appname}-${_fileversion}.AppImage"
     "${srcdir}/${_appname}-${_fileversion}.AppImage" --appimage-extract > /dev/null
diff --git a/fireblocks-recovery-utility.sh b/fireblocks-recovery-utility.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/fireblocks-recovery-utility.sh
+++ b/fireblocks-recovery-utility.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 set -e
 _APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_ASAR}" "$@"
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit
\ No newline at end of file
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file