update to 2.21.0

3 files changed, 33 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec2acf82e7d4..180e9dd596c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,25 @@
 pkgbase = buttercup-desktop-bin
 	pkgdesc = Cross-Platform Passwords & Secrets Vault
-	pkgver = 2.20.3
-	pkgrel = 4
+	pkgver = 2.21.0
+	pkgrel = 1
 	url = https://buttercup.pw/
 	arch = aarch64
 	arch = armv7h
 	arch = x86_64
 	license = GPL3
+	makedepends = squashfuse
 	depends = bash
 	depends = electron22
 	depends = hicolor-icon-theme
-	provides = buttercup-desktop=2.20.3
+	provides = buttercup-desktop=2.21.0
 	conflicts = buttercup-desktop
 	source = buttercup-desktop.sh
-	sha256sums = 3c46bb45089efd35a1f503d32f3ca67ecf46b09b1636baeacdf0f3febe60135b
-	source_aarch64 = buttercup-desktop-2.20.3-aarch64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.20.3/Buttercup-linux-arm64.AppImage
-	sha256sums_aarch64 = 76b885a9aae1a3f708f7202372b1c434a27d755275c24709d270f850dfca07e8
-	source_armv7h = buttercup-desktop-2.20.3-armv7h.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.20.3/Buttercup-linux-armv7l.AppImage
-	sha256sums_armv7h = ab49db4be607384a38b5365f9d796ccb4a3b8387dec37e9b096dfabeb1de8ef8
-	source_x86_64 = buttercup-desktop-2.20.3-x86_64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.20.3/Buttercup-linux-x86_64.AppImage
-	sha256sums_x86_64 = 7bb0998c94a400090d9fbdd9ddc83e0f9494751781a7aa6acfbccaadb907b37f
+	sha256sums = 4faee38e8f06e72f7a742a2bd13bf3f374275b1b85fe0381dfb609a0bbc40bf2
+	source_aarch64 = buttercup-desktop-2.21.0-aarch64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.21.0/Buttercup-linux-arm64.AppImage
+	sha256sums_aarch64 = e4fff59cf87affc13ab359dbc87bb57f1f213c00345ecf53cd65b5b4d1e67c66
+	source_armv7h = buttercup-desktop-2.21.0-armv7h.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.21.0/Buttercup-linux-armv7l.AppImage
+	sha256sums_armv7h = 9c305827c6bc44c897486d126dd36e2c05eecc7be5affeed1492d2e806177195
+	source_x86_64 = buttercup-desktop-2.21.0-x86_64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.21.0/Buttercup-linux-x86_64.AppImage
+	sha256sums_x86_64 = 385a9ac6b624d6fc998a0af614dea890c8c175bd9221ebc4345e3db9b6c70fc7
 
 pkgname = buttercup-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index 33e70aa9988e..488d55493a20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 _pkgname=buttercup
 pkgname="${_pkgname}-desktop-bin"
-pkgver=2.20.3
-pkgrel=4
+pkgver=2.21.0
+pkgrel=1
 pkgdesc="Cross-Platform Passwords & Secrets Vault"
 arch=('aarch64' 'armv7h' 'x86_64')
 url="https://buttercup.pw/"
@@ -10,24 +10,32 @@ _githuburl="https://github.com/buttercup/buttercup-desktop"
 license=('GPL3')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron22' 'hicolor-icon-theme')
+depends=(
+    'bash'
+    'electron22'
+    'hicolor-icon-theme'
+)
+makedepends=(
+    'squashfuse'
+)
 source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.AppImage::${_githuburl}/releases/download/v${pkgver}/${_pkgname//b/B}-linux-arm64.AppImage")
 source_armv7h=("${pkgname%-bin}-${pkgver}-armv7h.AppImage::${_githuburl}/releases/download/v${pkgver}/${_pkgname//b/B}-linux-armv7l.AppImage")
 source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.AppImage::${_githuburl}/releases/download/v${pkgver}/${_pkgname//b/B}-linux-x86_64.AppImage")
 source=("${pkgname%-bin}.sh")
-sha256sums=('3c46bb45089efd35a1f503d32f3ca67ecf46b09b1636baeacdf0f3febe60135b')
-sha256sums_aarch64=('76b885a9aae1a3f708f7202372b1c434a27d755275c24709d270f850dfca07e8')
-sha256sums_armv7h=('ab49db4be607384a38b5365f9d796ccb4a3b8387dec37e9b096dfabeb1de8ef8')
-sha256sums_x86_64=('7bb0998c94a400090d9fbdd9ddc83e0f9494751781a7aa6acfbccaadb907b37f')
-prepare() {
+sha256sums=('4faee38e8f06e72f7a742a2bd13bf3f374275b1b85fe0381dfb609a0bbc40bf2')
+sha256sums_aarch64=('e4fff59cf87affc13ab359dbc87bb57f1f213c00345ecf53cd65b5b4d1e67c66')
+sha256sums_armv7h=('9c305827c6bc44c897486d126dd36e2c05eecc7be5affeed1492d2e806177195')
+sha256sums_x86_64=('385a9ac6b624d6fc998a0af614dea890c8c175bd9221ebc4345e3db9b6c70fc7')
+build() {
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}-${CARCH}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}-${CARCH}.AppImage" --appimage-extract > /dev/null
-    sed "s|AppRun --no-sandbox %U|${pkgname%-bin}|g;s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g" \
+    1sed "s|AppRun --no-sandbox %U|${pkgname%-bin}|g;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}"
-    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${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 128x128 256x256;do
         install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${_pkgname}.png" \
             "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png"
diff --git a/buttercup-desktop.sh b/buttercup-desktop.sh
index d9ecc9c9e8fc..64ab44504a03 100644
--- a/buttercup-desktop.sh
+++ b/buttercup-desktop.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron22
-_ASAR="/opt/buttercup-desktop/buttercup-desktop.asar"
+APPDIR="/usr/lib/buttercup-desktop"
+export PATH="${APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else