summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052023-12-28 07:20:01 +0800
committerzxp198210052023-12-28 07:20:01 +0800
commit806088ca5c642980388ca737c1991632626db376 (patch)
tree05400905c3e96274ae99d58a4af80bf812768df2
parenta3885b453fa38459f3af34151e28f0c994092316 (diff)
downloadaur-806088ca5c642980388ca737c1991632626db376.tar.gz
update to 1.9.2-prod.2
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD15
-rw-r--r--fsolauncher.sh9
3 files changed, 19 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a9ee038ac6bd..f62c0feed44e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = fsolauncher
pkgdesc = Official FreeSO Launcher made with Electron
- pkgver = 1.9.2_prod.1
- pkgrel = 2
+ pkgver = 1.9.2_prod.2
+ pkgrel = 1
url = https://beta.freeso.org/
arch = x86_64
license = MPL2
@@ -11,9 +11,9 @@ pkgbase = fsolauncher
makedepends = git
depends = electron22
conflicts = fsolauncher
- source = fsolauncher-1.9.2_prod.1::https://github.com/ItsSim/fsolauncher.git#tag=1.9.2-prod.1
+ source = fsolauncher-1.9.2_prod.2::git+https://github.com/ItsSim/fsolauncher.git#tag=1.9.2-prod.2
source = fsolauncher.sh
- sha256sums = 2c750858c140cfdd6000e3a64efff873a52e860c4429cc202ad15f75fd1c5691
- sha256sums = 0264bc572b31604345e61a71d6af0cfdee9b3bbfdf0d4b9a51022c9157db21a3
+ sha256sums = SKIP
+ sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
pkgname = fsolauncher
diff --git a/PKGBUILD b/PKGBUILD
index f7c3a2dad560..1fc0c3da1760 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
pkgname=fsolauncher
-pkgver=1.9.2_prod.1
+pkgver=1.9.2_prod.2
_electronversion=22
-pkgrel=2
+_nodeversion=16
+pkgrel=1
pkgdesc="Official FreeSO Launcher made with Electron"
arch=('x86_64')
url="https://beta.freeso.org/"
@@ -19,16 +20,16 @@ makedepends=(
'git'
)
source=(
- "${pkgname}-${pkgver}::${_ghurl}.git#tag=${pkgver//_/-}"
+ "${pkgname}-${pkgver}::git+${_ghurl}.git#tag=${pkgver//_/-}"
"${pkgname%-bin}.sh"
)
-sha256sums=('2c750858c140cfdd6000e3a64efff873a52e860c4429cc202ad15f75fd1c5691'
- '0264bc572b31604345e61a71d6af0cfdee9b3bbfdf0d4b9a51022c9157db21a3')
+sha256sums=('SKIP'
+ '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
_ensure_local_nvm() {
export NVM_DIR="${srcdir}/.nvm"
source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
- nvm install 16
- nvm use 16
+ nvm install "${_nodeversion}"
+ nvm use "${_nodeversion}"
}
build() {
sed -e "s|@electronversion@|${_electronversion}|" \
diff --git a/fsolauncher.sh b/fsolauncher.sh
index 2ec4412e5c4f..c77c53567639 100644
--- a/fsolauncher.sh
+++ b/fsolauncher.sh
@@ -1,14 +1,17 @@
-#!/bin/bash
+#!/bin/sh
set -e
_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
export PATH="${_APPDIR}:${PATH}"
-export ELECTRON_IS_DEV=0
export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${_APPDIR}/@appasar@"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
cd "${_APPDIR}"
exec electron@electronversion@ "${_ASAR}" "$@"
+ exit
else
cd "${_APPDIR}"
exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+ exit
fi \ No newline at end of file