diff options
author | zxp19821005 | 2024-05-06 17:34:30 +0800 |
---|---|---|
committer | zxp19821005 | 2024-05-06 17:34:30 +0800 |
commit | 216352ca7daa0e8aeab8a31e79e574a91093e236 (patch) | |
tree | e076b484f06d60e6701e0711c4195cdd99cb5291 | |
parent | 21206d70bba0be7c87d72cf4aa39c0e3b7ac7e4f (diff) | |
download | aur-216352ca7daa0e8aeab8a31e79e574a91093e236.tar.gz |
update to 1.12.1_prod.16
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 19 | ||||
-rw-r--r-- | fsolauncher.sh | 19 |
3 files changed, 30 insertions, 19 deletions
@@ -1,6 +1,6 @@ pkgbase = fsolauncher pkgdesc = Official FreeSO Launcher made with Electron - pkgver = 1.12.1_prod.15 + pkgver = 1.12.1_prod.16 pkgrel = 1 url = https://beta.freeso.org/ arch = x86_64 @@ -8,15 +8,14 @@ pkgbase = fsolauncher makedepends = gendesk makedepends = npm makedepends = nvm - makedepends = git - depends = electron29 + depends = electron30 depends = nodejs conflicts = fsolauncher options = !strip options = !emptydirs - source = fsolauncher.git::git+https://github.com/ItsSim/fsolauncher.git#tag=1.12.1-prod.15 + source = fsolauncher-1.12.1_prod.16.tar.gz::https://github.com/ItsSim/fsolauncher/archive/refs/tags/1.12.1-prod.16.tar.gz source = fsolauncher.sh - sha256sums = SKIP - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = e0bcdf37e317f3f717b434865233a555d0cbb244b05b88e6f09536a20a28fe1f + sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a pkgname = fsolauncher @@ -1,8 +1,8 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=fsolauncher _pkgname="FreeSO Launcher" -pkgver=1.12.1_prod.15 -_electronversion=29 +pkgver=1.12.1_prod.16 +_electronversion=30 _nodeversion=16 pkgrel=1 pkgdesc="Official FreeSO Launcher made with Electron" @@ -19,18 +19,17 @@ makedepends=( 'gendesk' 'npm' 'nvm' - 'git' ) options=( '!strip' '!emptydirs' ) source=( - "${pkgname}.git::git+${_ghurl}.git#tag=${pkgver//_/-}" + "${pkgname}-${pkgver}.tar.gz::${_ghurl}/archive/refs/tags/${pkgver//_/-}.tar.gz" "${pkgname}.sh" ) -sha256sums=('SKIP' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') +sha256sums=('e0bcdf37e317f3f717b434865233a555d0cbb244b05b88e6f09536a20a28fe1f' + '05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -45,7 +44,7 @@ build() { -i "${srcdir}/${pkgname}.sh" _ensure_local_nvm gendesk -f -n -q --categories="Game" --name="${_pkgname}" --exec="${pkgname} %U" - cd "${srcdir}/${pkgname}.git/app" + cd "${srcdir}/${pkgname}-${pkgver//_/-}/app" export npm_config_build_from_source=true export npm_config_cache="${srcdir}/.npm_cache" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 @@ -67,8 +66,8 @@ build() { } package() { install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -Dm755 "${srcdir}/${pkgname}.git/release/${_pkgname}-linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" - cp -r "${srcdir}/${pkgname}.git/release/${_pkgname}-linux-"*/resources/app.asar.unpacked "${pkgdir}/usr/lib/${pkgname}" - install -Dm644 "${srcdir}/${pkgname}.git/app/beta.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + install -Dm755 "${srcdir}/${pkgname}-${pkgver//_/-}/release/${_pkgname}-linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" + cp -r "${srcdir}/${pkgname}-${pkgver//_/-}/release/${_pkgname}-linux-"*/resources/app.asar.unpacked "${pkgdir}/usr/lib/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}-${pkgver//_/-}/app/beta.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" }
\ No newline at end of file diff --git a/fsolauncher.sh b/fsolauncher.sh index 7ddcaab8d734..5594e5380ba2 100644 --- a/fsolauncher.sh +++ b/fsolauncher.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 |