diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | waveterm.sh | 19 |
3 files changed, 25 insertions, 12 deletions
@@ -1,14 +1,14 @@ pkgbase = waveterm-bin pkgdesc = An open-source, cross-platform terminal for seamless workflows.Use system-wide electron. - pkgver = 0.7.2 + pkgver = 0.7.5 pkgrel = 1 url = https://www.waveterm.dev arch = x86_64 license = Apache-2.0 - depends = electron29 - source = waveterm-0.7.2.pacman::https://github.com/wavetermdev/waveterm/releases/download/v0.7.2/Wave-linux-x64-0.7.2.pacman + depends = electron30 + source = waveterm-0.7.5.pacman::https://github.com/wavetermdev/waveterm/releases/download/v0.7.5/Wave-linux-x64-0.7.5.pacman source = waveterm.sh - sha256sums = 0d51502325e67a1bfbfd511de9c9a33d1584e82e56f00cfbe7fda51bef25faba - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 46b7b3aa4e5e7f19b89977b18ff18a4a5e166a56c566fb0171ad6865f01172fe + sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a pkgname = waveterm-bin @@ -2,8 +2,8 @@ # Contributor: criptixo <therealcriptixo@gmail.com> pkgname=waveterm-bin _pkgname=Wave -pkgver=0.7.2 -_electronversion=29 +pkgver=0.7.5 +_electronversion=30 pkgrel=1 pkgdesc='An open-source, cross-platform terminal for seamless workflows.Use system-wide electron.' arch=('x86_64') @@ -17,8 +17,8 @@ source=( "${pkgname%-bin}-${pkgver}.pacman::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-linux-x64-${pkgver}.pacman" "${pkgname%-bin}.sh" ) -sha256sums=('0d51502325e67a1bfbfd511de9c9a33d1584e82e56f00cfbe7fda51bef25faba' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') +sha256sums=('46b7b3aa4e5e7f19b89977b18ff18a4a5e166a56c566fb0171ad6865f01172fe' + '05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-bin}|g" \ diff --git a/waveterm.sh b/waveterm.sh index 7ddcaab8d734..5594e5380ba2 100644 --- a/waveterm.sh +++ b/waveterm.sh @@ -7,10 +7,23 @@ 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}" +_FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf" +declare -a flags +if [[ -f "${_FLAGS_FILE}" ]]; then + mapfile -t < "${_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}" "$@" || exit $? +if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $? else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $? fi
\ No newline at end of file |