fix errors

3 files changed, 43 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea3a163345d8..33ffb359c720 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
 pkgbase = nuclear-player
 	pkgdesc = A free, multiplatform music player app that streams from multiple sources.
 	pkgver = 0.6.30
-	pkgrel = 3
+	pkgrel = 4
 	url = http://nuclear.gumblert.tech/
 	arch = any
 	license = AGPL3
 	makedepends = gendesk
-	makedepends = npm>=8.0.0
+	makedepends = npm
 	makedepends = nvm
 	makedepends = make
+	makedepends = gcc
 	makedepends = git
 	makedepends = python
 	depends = electron12
-	source = nuclear-player-0.6.30::git+https://github.com/nukeop/nuclear#tag=v0.6.30
+	source = nuclear-player.git::git+https://github.com/nukeop/nuclear#tag=v0.6.30
 	source = nuclear-player.sh
 	sha256sums = SKIP
-	sha256sums = 882f9b949271ad0718d2d72b2663faf02b521dbb614c0cc51269768332ff5124
+	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
 
 pkgname = nuclear-player
diff --git a/PKGBUILD b/PKGBUILD
index 819ded8c57c1..0eea342eba75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,49 +3,59 @@
 pkgname=nuclear-player
 _pkgname="Nuclear Player"
 pkgver=0.6.30
-pkgrel=3
+_electronversion=12
+_nodeversion=18
+pkgrel=4
 pkgdesc="A free, multiplatform music player app that streams from multiple sources."
 arch=('any')
 url="http://nuclear.gumblert.tech/"
 _ghurl="https://github.com/nukeop/nuclear"
 license=('AGPL3')
 depends=(
-    'electron12'
+    "electron${_electronversion}"
 )
 makedepends=(
     'gendesk'
-    'npm>=8.0.0'
+    'npm'
     'nvm'
     'make'
+    'gcc'
     'git'
     'python'
 )
 source=(
-    "${pkgname}-${pkgver}::git+${_ghurl}#tag=v${pkgver}"
+    "${pkgname}.git::git+${_ghurl}#tag=v${pkgver}"
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            '882f9b949271ad0718d2d72b2663faf02b521dbb614c0cc51269768332ff5124')
+            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
-    nvm install 18
-    nvm use 18
+    nvm install "${_nodeversion}"
+    nvm use "${_nodeversion}"
 }
 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 -q -f -n --categories "AudioVideo" --name "${_pkgname}" --exec "${pkgname}"
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    sed -e 's|"snap"|"AppImage"|g;s|onTag|never|g;s|env.VERSION|version|g' \
-        -e '156,159d' \
-        -i package.json
-    npm ci --cache "${srcdir}/npm-cache"
+    cd "${srcdir}/${pkgname}.git"
+    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}"
+    sed -e '/"snap"/d;/"tar.gz",/d;/"rpm",/d;/"deb",/d;s|"AppImage",|"AppImage"|g;s|env.VERSION|version|g' -i package.json
+    npm ci
     npm run build:linux
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm755 "${srcdir}/${pkgname}-${pkgver}/release/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
-    cp -r "${srcdir}/${pkgname}-${pkgver}/release/linux-unpacked/resources/"{bin,media,musicgenresicons} "${pkgdir}/usr/lib/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/build/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm755 "${srcdir}/${pkgname}.git/release/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
+    cp -r "${srcdir}/${pkgname}.git/release/linux-unpacked/resources/"{bin,media,musicgenresicons} "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/build/icons/512x512.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/nuclear-player.sh b/nuclear-player.sh
index 05a6d1e9691f..aacd8f895847 100644
--- a/nuclear-player.sh
+++ b/nuclear-player.sh
@@ -1,11 +1,15 @@
-#!/bin/bash
-_ELECTRON=/usr/bin/electron12
-APPDIR="/usr/lib/nuclear-player"
-export PATH="${APPDIR}:${PATH}"
-#export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app.asar"
+#!/bin/sh
+set -e
+_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
+cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
-fi
\ No newline at end of file
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+fi
+exit
\ No newline at end of file