fix errors

3 files changed, 12 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a29ef8d0c38c..bb3d6a7bfe38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,21 @@
 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 = 1
+	pkgrel = 2
 	url = https://www.fireblocks.com/
 	arch = x86_64
 	license = GPL3
 	makedepends = squashfuse
 	depends = electron21
 	depends = hicolor-icon-theme
-	depends = libx11
-	depends = gdk-pixbuf2
-	depends = libxext
+	depends = dbus-glib
 	depends = libdbusmenu-glib
 	depends = gtk2
-	depends = dbus-glib
 	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 = d4632fd7fa2c2e156023ebc6927069ba7a8451f6ea591ed7dd6a5bb05ba9ddc8
+	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
 
 pkgname = fireblocks-recovery-utility-bin
diff --git a/PKGBUILD b/PKGBUILD
index 02beedd74246..53e987873434 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _appname="Fireblocks Recovery Utility"
 pkgver=0.4.1
 _fileversion="${pkgver}"
 _electronversion=21
-pkgrel=1
+pkgrel=2
 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/"
@@ -16,12 +16,9 @@ provides=("${pkgname%-bin}=${pkgver}")
 depends=(
     "electron${_electronversion}"
     'hicolor-icon-theme'
-    'libx11'
-    'gdk-pixbuf2'
-    'libxext'
+    'dbus-glib'
     'libdbusmenu-glib'
     'gtk2'
-    'dbus-glib'
 )
 makedepends=(
     'squashfuse'
@@ -31,7 +28,7 @@ source=(
     "${pkgname%-bin}.sh"
 )
 sha256sums=('b9829b24391a674403451c6c2c79cd536047325b77e303439cd0a69e00b754da'
-            'd4632fd7fa2c2e156023ebc6927069ba7a8451f6ea591ed7dd6a5bb05ba9ddc8')
+            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
@@ -40,7 +37,7 @@ build() {
     chmod a+x "${srcdir}/${_appname}-${_fileversion}.AppImage"
     "${srcdir}/${_appname}-${_fileversion}.AppImage" --appimage-extract > /dev/null
     find "${srcdir}/squashfs-root" -type d -perm 700 -exec chmod 755 {} \;
-    sed -e "s|AppRun --no-sandbox %U|${pkgname%-bin}|g" -e "s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${_pkgname}.desktop"
+    sed -e "s|AppRun --no-sandbox|${pkgname%-bin}|g" -e "s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${_pkgname}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
diff --git a/fireblocks-recovery-utility.sh b/fireblocks-recovery-utility.sh
index f1520e9a15ee..aacd8f895847 100644
--- a/fireblocks-recovery-utility.sh
+++ b/fireblocks-recovery-utility.sh
@@ -2,14 +2,14 @@
 set -e
 _APPDIR="/usr/lib/@appname@"
 _ASAR="${_APPDIR}/@appasar@"
-export ELECTRON_IS_DEV=0
+export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
 export NODE_ENV=production
-export PATH="${_APPDIR}:${PATH}"
+cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    cd "${_APPDIR}"
     exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    cd "${_APPDIR}"
     exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
\ No newline at end of file
+fi
+exit
\ No newline at end of file