diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | vscodius.sh | 22 |
3 files changed, 21 insertions, 20 deletions
@@ -1,6 +1,6 @@ pkgbase = vscodius-bin pkgdesc = Binary releases of Visual Studio Code without MS branding/telemetry/licensing and various personal workflow improvements. - pkgver = 1.89.0 + pkgver = 1.89.1 pkgrel = 1 url = https://github.com/RubisetCie/vscodius arch = x86_64 @@ -8,16 +8,16 @@ pkgbase = vscodius-bin makedepends = gendesk depends = electron28 depends = libxkbfile - provides = vscodius=1.89.0 + provides = vscodius=1.89.1 provides = code conflicts = vscodius conflicts = code options = !strip - source = vscodius-1.89.0.zip::https://github.com/RubisetCie/vscodius/releases/download/v1.89.0/VSCodius-Linux-x64-1.89.0.zip - source = LICENSE-1.89.0.txt::https://raw.githubusercontent.com/RubisetCie/vscodius/v1.89.0/LICENSE.txt + source = vscodius-1.89.1.zip::https://github.com/RubisetCie/vscodius/releases/download/v1.89.1/VSCodius-Linux-x64-1.89.1.zip + source = LICENSE-1.89.1.txt::https://raw.githubusercontent.com/RubisetCie/vscodius/v1.89.1/LICENSE.txt source = vscodius.sh - sha256sums = cd9f75c600568eb1f79d500732e7a96a81c61a991a433df903fc518a26979c54 + sha256sums = 3238f4edcbe18af6f9a8798043f9790144351aa67984191822022660d1ab8b5b sha256sums = 9480271317925265e806a9a196aaa33410a962fa9d4d1e248a4a5187bc8c9df9 - sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a + sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d pkgname = vscodius-bin @@ -2,7 +2,7 @@ _appname=codius pkgname="vs${_appname}-bin" _pkgname=VSCodius -pkgver=1.89.0 +pkgver=1.89.1 _electronversion=28 pkgrel=1 pkgdesc="Binary releases of Visual Studio Code without MS branding/telemetry/licensing and various personal workflow improvements." @@ -30,13 +30,14 @@ source=( "LICENSE-${pkgver}.txt::https://raw.githubusercontent.com/RubisetCie/vscodius/v${pkgver}/LICENSE.txt" "${pkgname%-bin}.sh" ) -sha256sums=('cd9f75c600568eb1f79d500732e7a96a81c61a991a433df903fc518a26979c54' +sha256sums=('3238f4edcbe18af6f9a8798043f9790144351aa67984191822022660d1ab8b5b' '9480271317925265e806a9a196aaa33410a962fa9d4d1e248a4a5187bc8c9df9' - '05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a') + '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d') build() { sed -e "s|@electronversion@|${_electronversion}|g" \ -e "s|@appname@|${pkgname%-bin}|g" \ -e "s|@runname@|app|g" \ + -e "s|@cfgdirname@|${_pkgname}|g" \ -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \ -i "${srcdir}/${pkgname%-bin}.sh" gendesk -f -n -q --pkgname="vs${_appname}-bin" --categories="Development" --name="${_pkgname}" --exec="${pkgname%-bin}" diff --git a/vscodius.sh b/vscodius.sh index 5594e5380ba2..398398461fee 100644 --- a/vscodius.sh +++ b/vscodius.sh @@ -1,7 +1,8 @@ #!/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}" @@ -11,19 +12,18 @@ 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}" -_FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf" -declare -a flags +export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf" +declare -a _USER_FLAGS if [[ -f "${_FLAGS_FILE}" ]]; then - mapfile -t < "${_FLAGS_FILE}" + while read -r line; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + _USER_FLAGS+=("${line}") + fi + done < "${_FLAGS_FILE}" fi -for line in "${MAPFILE[@]}"; do - if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then - flags+=("${line}") - fi -done cd "${_APPDIR}" if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |