diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | buttercup-desktop.sh | 17 |
3 files changed, 27 insertions, 23 deletions
@@ -1,6 +1,6 @@ pkgbase = buttercup-desktop-bin pkgdesc = Cross-Platform Passwords & Secrets Vault - pkgver = 2.23.0 + pkgver = 2.23.1 pkgrel = 1 url = https://buttercup.pw/ arch = aarch64 @@ -16,15 +16,15 @@ pkgbase = buttercup-desktop-bin depends = libdbusmenu-glib depends = gtk2 depends = dbus-glib - provides = buttercup-desktop=2.23.0 + provides = buttercup-desktop=2.23.1 conflicts = buttercup-desktop source = buttercup-desktop.sh - sha256sums = 55e302cfbe2211d2a679d4366bce082bee998b3f033af98fdfee79f9470613c8 - source_aarch64 = buttercup-desktop-2.23.0-aarch64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.23.0/Buttercup-linux-arm64.AppImage - sha256sums_aarch64 = 99470a78ecadf5a35234ed56e8509b85e011c843982cd2ab3fc592f338750fe1 - source_armv7h = buttercup-desktop-2.23.0-armv7h.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.23.0/Buttercup-linux-armv7l.AppImage - sha256sums_armv7h = 567dc1c5fa58adb6a507f39ba631370d1bdfba6d91e324c0fa84fe2d9e4eceee - source_x86_64 = buttercup-desktop-2.23.0-x86_64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.23.0/Buttercup-linux-x86_64.AppImage - sha256sums_x86_64 = 035e0303929a812453e4ac5e5e1ecf5ab3abb41a47f6d9504f41b4ba9d4ceca8 + sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84 + source_aarch64 = buttercup-desktop-2.23.1-aarch64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.23.1/Buttercup-linux-arm64.AppImage + sha256sums_aarch64 = 673c95421b1df2c57c8600ad1b231bfb9408aca78a6fa233e17f3f67e271727b + source_armv7h = buttercup-desktop-2.23.1-armv7h.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.23.1/Buttercup-linux-armv7l.AppImage + sha256sums_armv7h = 296a974f3fe3045400befbf900839a098978526a49f85465b65946fd3799af40 + source_x86_64 = buttercup-desktop-2.23.1-x86_64.AppImage::https://github.com/buttercup/buttercup-desktop/releases/download/v2.23.1/Buttercup-linux-x86_64.AppImage + sha256sums_x86_64 = b3eec46d21412e0190fb0864756b59b1ffd31231284ee15d702f420d47a57c61 pkgname = buttercup-desktop-bin @@ -1,7 +1,7 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> _pkgname=buttercup pkgname="${_pkgname}-desktop-bin" -pkgver=2.23.0 +pkgver=2.23.1 _electronversion=22 pkgrel=1 pkgdesc="Cross-Platform Passwords & Secrets Vault" @@ -28,16 +28,19 @@ source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.AppImage::${_githuburl}/relea 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=('55e302cfbe2211d2a679d4366bce082bee998b3f033af98fdfee79f9470613c8') -sha256sums_aarch64=('99470a78ecadf5a35234ed56e8509b85e011c843982cd2ab3fc592f338750fe1') -sha256sums_armv7h=('567dc1c5fa58adb6a507f39ba631370d1bdfba6d91e324c0fa84fe2d9e4eceee') -sha256sums_x86_64=('035e0303929a812453e4ac5e5e1ecf5ab3abb41a47f6d9504f41b4ba9d4ceca8') +sha256sums=('8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84') +sha256sums_aarch64=('673c95421b1df2c57c8600ad1b231bfb9408aca78a6fa233e17f3f67e271727b') +sha256sums_armv7h=('296a974f3fe3045400befbf900839a098978526a49f85465b65946fd3799af40') +sha256sums_x86_64=('b3eec46d21412e0190fb0864756b59b1ffd31231284ee15d702f420d47a57c61') build() { + 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}/${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" \ -i "${srcdir}/squashfs-root/${_pkgname}.desktop" - sed -i "s|@electronversion@|${_electronversion}|" "${srcdir}/${pkgname%-bin}.sh" } package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" diff --git a/buttercup-desktop.sh b/buttercup-desktop.sh index 4c16b02bd56d..2ec4412e5c4f 100644 --- a/buttercup-desktop.sh +++ b/buttercup-desktop.sh @@ -1,13 +1,14 @@ #!/bin/bash -APPDIR="/usr/lib/buttercup-desktop" +set -e +_APPDIR="/usr/lib/@appname@" +export PATH="${_APPDIR}:${PATH}" export ELECTRON_IS_DEV=0 -export PATH="${APPDIR}:${PATH}" -export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}" -_ASAR="${APPDIR}/app.asar" +export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" +_ASAR="${_APPDIR}/@appasar@" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - cd $APPDIR - exec electron@electronversion@ ${_ASAR} "$@" + cd "${_APPDIR}" + exec electron@electronversion@ "${_ASAR}" "$@" else - cd $APPDIR - exec electron@electronversion@ --no-sandbox "$@" + cd "${_APPDIR}" + exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" fi
\ No newline at end of file |