update to 0.4.0

1 files changed, 24 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 240568db159d..7f00af8d9e2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,9 @@
 _pkgname="fireblocks recovery utility"
 pkgname="${_pkgname// /-}-bin"
 _appname="Fireblocks Recovery Utility"
-pkgver=0.3.5
+pkgver=0.4.0
+_fileversion=0.3.5
+_electronversion=21
 pkgrel=1
 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')
@@ -12,49 +14,39 @@ license=('GPL3')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
 depends=(
-    'libxcomposite'
-    'libcups'
-    'libxkbcommon'
-    'mesa'
-    'libdbusmenu-glib'
-    'expat'
-    'gtk2'
-    'nss'
-    'nspr'
-    'wayland'
-    'libxext'
-    'dbus-glib'
+    "electron${_electronversion}"
     'hicolor-icon-theme'
-    'libxdamage'
     'libx11'
-    'libxrandr'
-    'alsa-lib'
-    'libxcb'
-    'at-spi2-core'
-    'gtk3'
-    'pango'
-    'libxfixes'
-    'libdrm'
-    'cairo'
     'gdk-pixbuf2'
+    'libxext'
+    'libdbusmenu-glib'
+    'gtk2'
+    'dbus-glib'
 )
 makedepends=(
     'squashfuse'
 )
 source=(
-    "${pkgname}-${pkgver}.zip::${_ghurl}/releases/download/v${pkgver%.2}/Recovery.Utility.Ubuntu.${CARCH//_/-}.zip
-")
-sha256sums=('365860a35536f396d085e532feca1faa04f23ffbaafeb1d412a0561aced60e89')
+    "${pkgname}-${pkgver}.zip::${_ghurl}/releases/download/v${pkgver}/Recovery.Utility.Ubuntu.${CARCH//_/-}.zip"
+    "${pkgname%-bin}.sh"
+)
+sha256sums=('a31f6e66af64cb30f4035b1d78a4326361443eb1c0076d72178dff21890d06ac'
+            'f38f1d09bb959d0ac2c1dd853aaa3a477d398e785d262efffd98da4f6b0b4e09')
 build() {
-    chmod a+x "${srcdir}/${_appname}-${pkgver}.AppImage"
-    "${srcdir}/${_appname}-${pkgver}.AppImage" --appimage-extract > /dev/null
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
+    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|${pkgname%-bin}|g" -e "s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${_pkgname}.desktop"
+    sed -e "s|AppRun --no-sandbox %U|${pkgname%-bin}|g" -e "s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${_pkgname}.desktop"
 }
 package() {
-    install -Dm755 -d "${pkgdir}/"{opt/"${pkgname%-bin}",usr/bin}
-    cp -r "${srcdir}/squashfs-root/"* "${pkgdir}/opt/${pkgname%-bin}"
-    ln -sf "/opt/${pkgname%-bin}/AppRun" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${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"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do
         install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${_pkgname}.png" \
             "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png"