fix errors

3 files changed, 49 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f21cb773172..a9ee038ac6bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = fsolauncher
 	pkgdesc = Official FreeSO Launcher made with Electron
 	pkgver = 1.9.2_prod.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://beta.freeso.org/
 	arch = x86_64
 	license = MPL2
 	makedepends = gendesk
 	makedepends = npm
-	makedepends = nodejs>=16.20.2
-	depends = bash
+	makedepends = nvm
+	makedepends = git
 	depends = electron22
 	conflicts = fsolauncher
-	source = fsolauncher-1.9.2_prod.1.tar.gz::https://github.com/ItsSim/fsolauncher/archive/refs/tags/1.9.2-prod.1.tar.gz
+	source = fsolauncher-1.9.2_prod.1::https://github.com/ItsSim/fsolauncher.git#tag=1.9.2-prod.1
 	source = fsolauncher.sh
 	sha256sums = 2c750858c140cfdd6000e3a64efff873a52e860c4429cc202ad15f75fd1c5691
 	sha256sums = 0264bc572b31604345e61a71d6af0cfdee9b3bbfdf0d4b9a51022c9157db21a3
diff --git a/PKGBUILD b/PKGBUILD
index 7f7598c85e71..f7c3a2dad560 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,54 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=fsolauncher
 pkgver=1.9.2_prod.1
-pkgrel=1
+_electronversion=22
+pkgrel=2
 pkgdesc="Official FreeSO Launcher made with Electron"
 arch=('x86_64')
 url="https://beta.freeso.org/"
-_githuburl="https://github.com/ItsSim/fsolauncher"
+_ghurl="https://github.com/ItsSim/fsolauncher"
 license=('MPL2')
 conflicts=("${pkgname}")
-depends=('bash' 'electron22')
-makedepends=('gendesk' 'npm' 'nodejs>=16.20.2')
-source=("${pkgname}-${pkgver}.tar.gz::${_githuburl}/archive/refs/tags/${pkgver//_/-}.tar.gz"
-    "${pkgname%-bin}.sh")
+depends=(
+    "electron${_electronversion}"
+)
+makedepends=(
+    'gendesk'
+    'npm'
+    'nvm'
+    'git'
+)
+source=(
+    "${pkgname}-${pkgver}::${_ghurl}.git#tag=${pkgver//_/-}"
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('2c750858c140cfdd6000e3a64efff873a52e860c4429cc202ad15f75fd1c5691'
             '0264bc572b31604345e61a71d6af0cfdee9b3bbfdf0d4b9a51022c9157db21a3')
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install 16
+    nvm use 16
+}
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname}.sh"
+    _ensure_local_nvm
     gendesk -f -n -q --categories "Game" --name "${pkgname}" --exec "${pkgname}"
-    cd "${srcdir}/${pkgname}-${pkgver//_/-}/src"
+    cd "${srcdir}/${pkgname}-${pkgver}/src"
+    export npm_config_build_from_source=true
+    export npm_config_cache="${srcdir}/.npm_cache"
+    export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+    export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    export ELECTRONVERSION="${_electronversion}"
     npm ci
     npx electron-builder --linux appimage
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver//_/-}/src/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver//_/-}/src/beta.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/src/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/src/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 7cd3d5c11649..2ec4412e5c4f 100644
--- a/fsolauncher.sh
+++ b/fsolauncher.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron22
-_ASAR="/opt/fsolauncher/resources/app.asar"
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
 fi
\ No newline at end of file