diff options
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | selvania-launcher.sh | 19 |
3 files changed, 28 insertions, 15 deletions
@@ -1,19 +1,19 @@ pkgbase = selvania-launcher-bin pkgdesc = Custom launcher for modded minecraft written in electron.js and Node.js - pkgver = 2.0.3 + pkgver = 2.0.5 pkgrel = 1 url = http://luuxis.fr/ arch = x86_64 license = CC-BY-ND-4.0 makedepends = fuse2 - depends = electron29 - provides = selvania-launcher=2.0.3 + depends = electron30 + provides = selvania-launcher=2.0.5 conflicts = selvania-launcher - source = selvania-launcher-2.0.3.AppImage::https://github.com/luuxis/Selvania-Launcher/releases/download/2.0.3/Selvania-Launcher-linux-x86_64.AppImage - source = LICENSE-2.0.3.md::https://raw.githubusercontent.com/luuxis/Selvania-Launcher/2.0.3/LICENSE.md + source = selvania-launcher-2.0.5.AppImage::https://github.com/luuxis/Selvania-Launcher/releases/download/2.0.5/Selvania-Launcher-linux-x86_64.AppImage + source = LICENSE-2.0.5.md::https://raw.githubusercontent.com/luuxis/Selvania-Launcher/2.0.5/LICENSE.md source = selvania-launcher.sh - sha256sums = 85c7e747788d0047fcdcc05192055d1784f0b71471cca19ca0a13c27bab4b67f + sha256sums = cd5915ecfdc6365da7c4a15250101366ef751d497b525232c275058a5d65375a sha256sums = 7c73b8f626696c0403394da3dae0d5ed33009cc2d674803d40bc4e2c7e67174b - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a pkgname = selvania-launcher-bin @@ -1,8 +1,8 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=selvania-launcher-bin _pkgname=Selvania-Launcher -pkgver=2.0.3 -_electronversion=29 +pkgver=2.0.5 +_electronversion=30 pkgrel=1 pkgdesc="Custom launcher for modded minecraft written in electron.js and Node.js" arch=("x86_64") @@ -22,14 +22,14 @@ source=( "LICENSE-${pkgver}.md::https://raw.githubusercontent.com/luuxis/Selvania-Launcher/${pkgver}/LICENSE.md" "${pkgname%-bin}.sh" ) -sha256sums=('85c7e747788d0047fcdcc05192055d1784f0b71471cca19ca0a13c27bab4b67f' +sha256sums=('cd5915ecfdc6365da7c4a15250101366ef751d497b525232c275058a5d65375a' '7c73b8f626696c0403394da3dae0d5ed33009cc2d674803d40bc4e2c7e67174b' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a') build() { sed -e "s|@electronversion@|${_electronversion}|g" \ -e "s|@appname@|${pkgname%-bin}|g" \ -e "s|@runname@|app.asar|g" \ - -e "s|@options@||g" \ + -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \ -i "${srcdir}/${pkgname%-bin}.sh" chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null diff --git a/selvania-launcher.sh b/selvania-launcher.sh index 7ddcaab8d734..5594e5380ba2 100644 --- a/selvania-launcher.sh +++ b/selvania-launcher.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 |