diff options
author | zxp19821005 | 2024-06-28 10:03:47 +0800 |
---|---|---|
committer | zxp19821005 | 2024-06-28 10:03:47 +0800 |
commit | f9c7c5ba41a71539e10fea385301819c9a2a8b1d (patch) | |
tree | f51604d5cb9ff663db5f44c78715189f03cc856a | |
parent | 91c128ca75f74d40311b148fe5a29e0cc67bd962 (diff) | |
download | aur-f9c7c5ba41a71539e10fea385301819c9a2a8b1d.tar.gz |
fix errors
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | salesforce2sql.sh | 21 |
3 files changed, 23 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = salesforce2sql-bin pkgdesc = Electron app to convert a Salesforce org's schema into a similarly shaped database. pkgver = 0.10.0 - pkgrel = 3 + pkgrel = 4 url = https://github.com/acrosman/Salesforce2Sql arch = x86_64 license = MIT @@ -15,6 +15,6 @@ pkgbase = salesforce2sql-bin source = salesforce2sql-0.10.0.rpm::https://github.com/acrosman/Salesforce2Sql/releases/download/v0.10.0/salesforce2sql-0.10.0-1.x86_64.rpm source = salesforce2sql.sh sha256sums = 5abdb9dfc1c43bb2fa6cc6e11bc98d049051d7589d3fe123d3184284fc9ccf49 - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = salesforce2sql-bin @@ -2,7 +2,7 @@ pkgname=salesforce2sql-bin pkgver=0.10.0 _electronversion=28 -pkgrel=3 +pkgrel=4 pkgdesc="Electron app to convert a Salesforce org's schema into a similarly shaped database." arch=('x86_64') url="https://github.com/acrosman/Salesforce2Sql" @@ -23,12 +23,13 @@ source=( "${pkgname%-bin}.sh" ) sha256sums=('5abdb9dfc1c43bb2fa6cc6e11bc98d049051d7589d3fe123d3184284fc9ccf49' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-bin}|g" \ -e "s|@runname@|app|g" \ - -e "s|@options@||g" \ + -e "s|@cfgdirname@|${pkgname%-bin}|g" \ + -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \ -i "${srcdir}/${pkgname%-bin}.sh" } package() { diff --git a/salesforce2sql.sh b/salesforce2sql.sh index 7ddcaab8d734..4cfe3ac09dd8 100644 --- a/salesforce2sql.sh +++ b/salesforce2sql.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 |