diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | better-osu-skills.sh | 21 |
3 files changed, 24 insertions, 12 deletions
@@ -1,17 +1,16 @@ pkgbase = better-osu-skills-bin pkgdesc = Gets results from the osu!Skills training page and PMs them on osu! using your own IRC credentials pkgver = 1.0.6 - pkgrel = 5 + pkgrel = 6 url = https://github.com/straightcurve/better-osuskills arch = x86_64 license = MIT makedepends = fuse2 - depends = electron11-bin - depends = hicolor-icon-theme + depends = electron11 conflicts = better-osu-skills source = better-osu-skills-1.0.6.AppImage::https://github.com/straightcurve/better-osuskills/releases/download/v1.0.6/better-osu-skills-1.0.6.AppImage source = better-osu-skills.sh sha256sums = 8fe449e2e93f061a3446aa2fd346eaeb0982b83529ed381834b059c7bb1f7d28 - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = better-osu-skills-bin @@ -2,15 +2,14 @@ pkgname=better-osu-skills-bin pkgver=1.0.6 _electronversion=11 -pkgrel=5 +pkgrel=6 pkgdesc="Gets results from the osu!Skills training page and PMs them on osu! using your own IRC credentials" arch=('x86_64') url="https://github.com/straightcurve/better-osuskills" license=('MIT') conflicts=("${pkgname%-bin}") depends=( - "electron${_electronversion}-bin" - 'hicolor-icon-theme' + "electron${_electronversion}" ) makedepends=( 'fuse2' @@ -20,11 +19,12 @@ source=( "${pkgname%-bin}.sh" ) sha256sums=('8fe449e2e93f061a3446aa2fd346eaeb0982b83529ed381834b059c7bb1f7d28' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -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/better-osu-skills.sh b/better-osu-skills.sh index 7ddcaab8d734..4cfe3ac09dd8 100644 --- a/better-osu-skills.sh +++ b/better-osu-skills.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 |