diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | bdash.sh | 21 |
3 files changed, 24 insertions, 12 deletions
@@ -1,13 +1,12 @@ pkgbase = bdash-bin pkgdesc = Simple SQL Client for lightweight data analysis. pkgver = 1.16.3 - pkgrel = 3 + pkgrel = 4 url = https://github.com/bdash-app/bdash arch = x86_64 license = MIT makedepends = fuse2 - depends = electron14-bin - depends = hicolor-icon-theme + depends = electron14 provides = bdash=1.16.3 conflicts = bdash source = bdash-1.16.3.AppImage::https://github.com/bdash-app/bdash/releases/download/v1.16.3/Bdash-1.16.3.AppImage @@ -15,6 +14,6 @@ pkgbase = bdash-bin source = bdash.sh sha256sums = 0af51b09eac9657d7b80e07ceabeece495edbaa0d5425de387672e489dbd8a40 sha256sums = 44e997a14d296ed01f24a68d2071280936534e98f4613fa8b875c9922e6b22d8 - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = bdash-bin @@ -3,7 +3,7 @@ pkgname=bdash-bin _pkgname=Bdash pkgver=1.16.3 _electronversion=14 -pkgrel=3 +pkgrel=4 pkgdesc="Simple SQL Client for lightweight data analysis." arch=('x86_64') url="https://github.com/bdash-app/bdash" @@ -11,8 +11,7 @@ license=('MIT') conflicts=("${pkgname%-bin}") provides=("${pkgname%-bin}=${pkgver}") depends=( - "electron${_electronversion}-bin" - 'hicolor-icon-theme' + "electron${_electronversion}" ) makedepends=( 'fuse2' @@ -24,11 +23,12 @@ source=( ) sha256sums=('0af51b09eac9657d7b80e07ceabeece495edbaa0d5425de387672e489dbd8a40' '44e997a14d296ed01f24a68d2071280936534e98f4613fa8b875c9922e6b22d8' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-bin}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${_pkgname}|g" \ -e "s|@options@||g" \ -i "${srcdir}/${pkgname%-bin}.sh" chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" @@ -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 |