diff options
| author | zxp19821005 | 2024-05-13 13:35:11 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-05-13 13:35:11 +0800 |
| commit | e87aa1f9bcacfe407002df2e9e8c5d629328c340 (patch) | |
| tree | bdea0b89da4d1cbee32434c4eb738355f446a6f5 | |
| parent | 19fe9cfd64f7c54a1ded966a380433702eb0fe79 (diff) | |
| download | aur-chain-desktop-wallet-bin.tar.gz | |
fix errors
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | chain-desktop-wallet.sh | 21 |
3 files changed, 24 insertions, 10 deletions
@@ -1,17 +1,17 @@ pkgbase = chain-desktop-wallet-bin pkgdesc = Crypto.com DeFi Desktop Wallet pkgver = 1.5.0 - pkgrel = 1 + pkgrel = 2 url = https://crypto.com/defi-wallet arch = x86_64 license = Apache-2.0 makedepends = fuse2 - depends = electron19-bin + depends = electron19 provides = chain-desktop-wallet=1.5.0 conflicts = chain-desktop-wallet source = chain-desktop-wallet-1.5.0.AppImage::https://github.com/crypto-com/chain-desktop-wallet/releases/download/v1.5.0/Crypto.com-DeFi-Desktop-Wallet-1.5.0.AppImage source = chain-desktop-wallet.sh sha256sums = 4769a940ff0c46852a2cf0ca2f1c87f8234d8ecb40a1f35e8a5896bda35ad818 - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d pkgname = chain-desktop-wallet-bin @@ -3,7 +3,7 @@ pkgname=chain-desktop-wallet-bin _appname="Crypto.com-DeFi-Desktop-Wallet" pkgver=1.5.0 _electronversion=19 -pkgrel=1 +pkgrel=2 pkgdesc="Crypto.com DeFi Desktop Wallet" arch=('x86_64') url="https://crypto.com/defi-wallet" @@ -12,7 +12,7 @@ license=("Apache-2.0") provides=("${pkgname%-bin}=${pkgver}") conflicts=("${pkgname%-bin}") depends=( - "electron${_electronversion}-bin" + "electron${_electronversion}" ) makedepends=( 'fuse2' @@ -22,11 +22,12 @@ source=( "${pkgname%-bin}.sh" ) sha256sums=('4769a940ff0c46852a2cf0ca2f1c87f8234d8ecb40a1f35e8a5896bda35ad818' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-bin}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${pkgname%-bin}|g" \ -e "s|@options@||g" \ -i "${srcdir}/${pkgname%-bin}.sh" chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" diff --git a/chain-desktop-wallet.sh b/chain-desktop-wallet.sh index 7ddcaab8d734..398398461fee 100644 --- a/chain-desktop-wallet.sh +++ b/chain-desktop-wallet.sh @@ -1,16 +1,29 @@ #!/bin/bash -set -e +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}" "${_OPTIONS}" "$@" || exit $? +if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |