diff options
author | zxp19821005 | 2024-05-29 15:43:46 +0800 |
---|---|---|
committer | zxp19821005 | 2024-05-29 15:43:46 +0800 |
commit | 0293aff76d5ba54421d733728e57562f8047d86d (patch) | |
tree | 7bc7cd2ff5cfb6b8189c4cc6eac2f7b67e876376 | |
parent | 67afd98dce333ba1d751620fcc0dd65ff5f79285 (diff) | |
download | aur-fireblocks-recovery-utility-bin.tar.gz |
fix errors
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | fireblocks-recovery-utility.sh | 25 |
3 files changed, 27 insertions, 11 deletions
@@ -1,17 +1,17 @@ pkgbase = fireblocks-recovery-utility-bin pkgdesc = Recover Fireblocks assets and keys in a disaster, verify a Recovery Kit, or generate keys to set up a new Recovery Kit. pkgver = 0.4.1 - pkgrel = 4 + pkgrel = 5 url = https://www.fireblocks.com/ arch = x86_64 license = GPL-3.0-only makedepends = fuse2 - depends = electron21-bin + depends = electron21 provides = fireblocks-recovery-utility=0.4.1 conflicts = fireblocks-recovery-utility source = fireblocks-recovery-utility-bin-0.4.1.zip::https://github.com/fireblocks/recovery/releases/download/v0.4.1/Recovery.Utility.Ubuntu.x86-64.zip source = fireblocks-recovery-utility.sh sha256sums = b9829b24391a674403451c6c2c79cd536047325b77e303439cd0a69e00b754da - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = fireblocks-recovery-utility-bin @@ -5,7 +5,7 @@ _appname="Fireblocks Recovery Utility" pkgver=0.4.1 _fileversion="${pkgver}" _electronversion=21 -pkgrel=4 +pkgrel=5 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') url="https://www.fireblocks.com/" @@ -14,7 +14,7 @@ license=('GPL-3.0-only') conflicts=("${pkgname%-bin}") provides=("${pkgname%-bin}=${pkgver}") depends=( - "electron${_electronversion}-bin" + "electron${_electronversion}" ) makedepends=( 'fuse2' @@ -24,11 +24,12 @@ source=( "${pkgname%-bin}.sh" ) sha256sums=('b9829b24391a674403451c6c2c79cd536047325b77e303439cd0a69e00b754da' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-bin}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${_appname}|g" \ -e "s|@options@||g" \ -i "${srcdir}/${pkgname%-bin}.sh" chmod a+x "${srcdir}/${_appname}-${_fileversion}.AppImage" diff --git a/fireblocks-recovery-utility.sh b/fireblocks-recovery-utility.sh index f9ced1432cfc..4cfe3ac09dd8 100644 --- a/fireblocks-recovery-utility.sh +++ b/fireblocks-recovery-utility.sh @@ -1,14 +1,29 @@ -#!/bin/sh -set -e +#!/bin/bash +set -o pipefail _APPDIR="/usr/lib/@appname@" _RUNNAME="${_APPDIR}/@runname@" +_CFGDIR="@cfgdirname@/" +_OPTIONS="@options@" export PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" export ELECTRON_IS_DEV=0 +export ELECTRON_FORCE_IS_PACKAGED=true +export ELECTRON_DISABLE_SECURITY_WARNINGS=true +export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@" export NODE_ENV=production +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf" +declare -a _USER_FLAGS +if [[ -f "${_FLAGS_FILE}" ]]; then + while read -r line; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + _USER_FLAGS+=("${line}") + fi + done < "${_FLAGS_FILE}" +fi cd "${_APPDIR}" -if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $? +if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |