diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | electronim.sh | 21 |
3 files changed, 31 insertions, 16 deletions
@@ -1,17 +1,17 @@ pkgbase = electronim-bin pkgdesc = Electron based multi IM (Instant Messaging) client - pkgver = 0.0.100 - pkgrel = 2 + pkgver = 0.0.101 + pkgrel = 1 url = https://github.com/manusa/electronim arch = x86_64 license = Apache-2.0 makedepends = fuse2 - depends = electron28 - provides = electronim=0.0.100 + depends = electron29 + provides = electronim=0.0.101 conflicts = electronim - source = electronim-0.0.100.AppImage::https://github.com/manusa/electronim/releases/download/v0.0.100/electronim-linux-x86_64.AppImage + source = electronim-0.0.101.AppImage::https://github.com/manusa/electronim/releases/download/v0.0.101/electronim-linux-x86_64.AppImage source = electronim.sh - sha256sums = ff2201b97274c59766ae491bb266583344456e3864c1a857f4fd7d9e1523ccde - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = c07e5a8f5d14dd8531ce3488c9756bd566f02f6c4794b43ce9a7696268542d7b + sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d pkgname = electronim-bin @@ -1,8 +1,9 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=electronim-bin -pkgver=0.0.100 -_electronversion=28 -pkgrel=2 +_pkgname=ElectronIM +pkgver=0.0.101 +_electronversion=29 +pkgrel=1 pkgdesc="Electron based multi IM (Instant Messaging) client" arch=('x86_64') url="https://github.com/manusa/electronim" @@ -19,12 +20,13 @@ source=( "${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/v${pkgver}/${pkgname%-bin}-linux-${CARCH}.AppImage" "${pkgname%-bin}.sh" ) -sha256sums=('ff2201b97274c59766ae491bb266583344456e3864c1a857f4fd7d9e1523ccde' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') +sha256sums=('c07e5a8f5d14dd8531ce3488c9756bd566f02f6c4794b43ce9a7696268542d7b' + '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d') build() { sed -e "s|@electronversion@|${_electronversion}|g" \ -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/electronim.sh b/electronim.sh index 7ddcaab8d734..398398461fee 100644 --- a/electronim.sh +++ b/electronim.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 |