fix errors

3 files changed, 11 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4807406cf24..e5d3204b83df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,12 @@
 pkgbase = altitude-metrix-wallet-bin
 	pkgdesc = The Metrix wallet https://metrixcoin.com.
 	pkgver = 3.3.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/TheLindaProjectInc/Altitude
 	arch = x86_64
-	license = GPL3
-	makedepends = squashfuse
+	license = GPL-3.0-only
 	depends = hicolor-icon-theme
 	depends = electron25
-	depends = dbus-glib
-	depends = libdbusmenu-glib
-	depends = gtk2
 	depends = java-runtime
 	depends = nodejs
 	provides = altitude-metrix-wallet=3.3.2
@@ -18,6 +14,6 @@ pkgbase = altitude-metrix-wallet-bin
 	source = altitude-metrix-wallet-3.3.2.AppImage::https://github.com/TheLindaProjectInc/Altitude/releases/download/3.3.2/Altitude-Metrix-Wallet-linux-x64.AppImage
 	source = altitude-metrix-wallet.sh
 	sha256sums = 1dd43d34b0c4e8870d099dbcaacfe09b8121f16453e336f446aeae1e79871301
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = altitude-metrix-wallet-bin
diff --git a/PKGBUILD b/PKGBUILD
index a4272e95e9f4..e41a5678fc3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,35 +3,29 @@ pkgname=altitude-metrix-wallet-bin
 _appname=Altitude-Metrix-Wallet
 pkgver=3.3.2
 _electronversion=25
-pkgrel=1
+pkgrel=2
 pkgdesc="The Metrix wallet https://metrixcoin.com."
 arch=('x86_64')
 url="https://github.com/TheLindaProjectInc/Altitude"
-license=('GPL3')
+license=('GPL-3.0-only')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
     'hicolor-icon-theme'
     "electron${_electronversion}"
-    'dbus-glib'
-    'libdbusmenu-glib'
-    'gtk2'
     'java-runtime'
     'nodejs'
 )
-makedepends=(
-    'squashfuse'
-)
 source=(
     "${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/${pkgver}/${_appname}-linux-x64.AppImage"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('1dd43d34b0c4e8870d099dbcaacfe09b8121f16453e336f446aeae1e79871301'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|g" \
         -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}/${pkgname%-bin}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
@@ -42,7 +36,6 @@ package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" -t "${pkgdir}/usr/bin/${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/usr/lib/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/lib"
     install -Dm644 "${srcdir}/squashfs-root/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     for _icons in 16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do
         install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
diff --git a/altitude-metrix-wallet.sh b/altitude-metrix-wallet.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/altitude-metrix-wallet.sh
+++ b/altitude-metrix-wallet.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