update to 2.25.0

3 files changed, 23 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7d92c13532f..ba8fb7d05d9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,27 @@
 pkgbase = buttercup-desktop-bin
 	pkgdesc = Cross-Platform Passwords & Secrets Vault
-	pkgver = 2.24.4
-	pkgrel = 2
+	pkgver = 2.25.0
+	pkgrel = 1
 	url = https://buttercup.pw/
 	arch = aarch64
 	arch = armv7h
 	arch = x86_64
-	license = GPL3
+	license = GPL-3.0-only
 	makedepends = squashfuse
 	depends = electron22
 	depends = hicolor-icon-theme
 	depends = dbus-glib
 	depends = libdbusmenu-glib
 	depends = gtk2
-	provides = buttercup-desktop=2.24.4
+	provides = buttercup-desktop=2.25.0
 	conflicts = buttercup-desktop
 	source = buttercup-desktop.sh
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
-	source_aarch64 = buttercup-desktop-2.24.4-aarch64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.24.4/Buttercup-linux-arm64.AppImage
-	sha256sums_aarch64 = ba9c950c3bd48da59d39a71bed5d020ae5ceb821968dc9e2d4f7da4a97140442
-	source_armv7h = buttercup-desktop-2.24.4-armv7h.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.24.4/Buttercup-linux-armv7l.AppImage
-	sha256sums_armv7h = ad8f31dfd6353ce0d061d8dfd58af02b1cbd626dea93e96929d6bd376388bab0
-	source_x86_64 = buttercup-desktop-2.24.4-x86_64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.24.4/Buttercup-linux-x86_64.AppImage
-	sha256sums_x86_64 = 73930b8ffd4e4a31acc9208435e26a121b9bc65db2eee0e19ce040b4b1b2f762
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
+	source_aarch64 = buttercup-desktop-2.25.0-aarch64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.25.0/Buttercup-linux-arm64.AppImage
+	sha256sums_aarch64 = 01bcf49e134499566924f5c6b3c46db436de72a4c9a5263963d2d632f130c97d
+	source_armv7h = buttercup-desktop-2.25.0-armv7h.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.25.0/Buttercup-linux-armv7l.AppImage
+	sha256sums_armv7h = b8b9056d569dbb87c75f0840f02f6e8e31249b2ee35ed99c2cc082684ba45f6f
+	source_x86_64 = buttercup-desktop-2.25.0-x86_64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.25.0/Buttercup-linux-x86_64.AppImage
+	sha256sums_x86_64 = 22039346de324ff33320467799797b3cf03428d713c20bc7d8fce3bd5270e2f0
 
 pkgname = buttercup-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index b4aeb78cf6ab..1d50d3c6cf0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 _pkgname=buttercup
 pkgname="${_pkgname}-desktop-bin"
-pkgver=2.24.4
+pkgver=2.25.0
 _electronversion=22
-pkgrel=2
+pkgrel=1
 pkgdesc="Cross-Platform Passwords & Secrets Vault"
 arch=(
     'aarch64'
@@ -12,7 +12,7 @@ arch=(
 )
 url="https://buttercup.pw/"
 _ghurl="https://github.com/buttercup/buttercup-desktop"
-license=('GPL3')
+license=('GPL-3.0-only')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
@@ -29,14 +29,14 @@ source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.AppImage::${_ghurl}/releases/
 source_armv7h=("${pkgname%-bin}-${pkgver}-armv7h.AppImage::${_ghurl}/releases/download/v${pkgver}/${_pkgname//b/B}-linux-armv7l.AppImage")
 source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.AppImage::${_ghurl}/releases/download/v${pkgver}/${_pkgname//b/B}-linux-x86_64.AppImage")
 source=("${pkgname%-bin}.sh")
-sha256sums=('d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
-sha256sums_aarch64=('ba9c950c3bd48da59d39a71bed5d020ae5ceb821968dc9e2d4f7da4a97140442')
-sha256sums_armv7h=('ad8f31dfd6353ce0d061d8dfd58af02b1cbd626dea93e96929d6bd376388bab0')
-sha256sums_x86_64=('73930b8ffd4e4a31acc9208435e26a121b9bc65db2eee0e19ce040b4b1b2f762')
+sha256sums=('0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
+sha256sums_aarch64=('01bcf49e134499566924f5c6b3c46db436de72a4c9a5263963d2d632f130c97d')
+sha256sums_armv7h=('b8b9056d569dbb87c75f0840f02f6e8e31249b2ee35ed99c2cc082684ba45f6f')
+sha256sums_x86_64=('22039346de324ff33320467799797b3cf03428d713c20bc7d8fce3bd5270e2f0')
 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}/${pkgname%-bin}-${pkgver}-${CARCH}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}-${CARCH}.AppImage" --appimage-extract > /dev/null
diff --git a/buttercup-desktop.sh b/buttercup-desktop.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/buttercup-desktop.sh
+++ b/buttercup-desktop.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