fix errors

3 files changed, 48 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4064e9891d0f..b13758735d14 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = nuclear-player
 	pkgdesc = A free, multiplatform music player app that streams from multiple sources.
 	pkgver = 0.6.30
-	pkgrel = 2
+	pkgrel = 3
 	url = http://nuclear.gumblert.tech/
 	arch = any
-	license = GPL3
+	license = AGPL3
 	makedepends = gendesk
 	makedepends = npm>=8.0.0
-	makedepends = nodejs>=18.0.0
+	makedepends = nvm
 	makedepends = make
-	makedepends = asar
-	depends = bash
+	makedepends = git
+	makedepends = python
 	depends = electron12
-	source = nuclear-player-0.6.30.tar.gz::https://github.com/nukeop/nuclear/archive/refs/tags/v0.6.30.tar.gz
+	source = nuclear-player-0.6.30::git+https://github.com/nukeop/nuclear#tag=v0.6.30
 	source = nuclear-player.sh
-	sha256sums = ba98bb6e4766c8a63ddba0254e4b9a80197196dea8b7f4a73693ba4602ebfdf4
-	sha256sums = 200b71666dd12149ef2eee2426d7115ead1b460b7aed196f5b1c1354c5feba84
+	sha256sums = SKIP
+	sha256sums = b3c8c080b48b5ecf1e3ed83493495f9e04c955c3976fe87ad8b646a7134e7840
 
 pkgname = nuclear-player
diff --git a/PKGBUILD b/PKGBUILD
index 1b120ec37b15..02624c245bb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,51 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 # Contributor: Mikel Pintado <mikelaitornube2010@gmail.com>
 pkgname=nuclear-player
+_pkgname="Nuclear Player"
 pkgver=0.6.30
-pkgrel=2
+pkgrel=3
 pkgdesc="A free, multiplatform music player app that streams from multiple sources."
 arch=('any')
 url="http://nuclear.gumblert.tech/"
-_githuburl="https://github.com/nukeop/nuclear"
-license=('GPL3')
-depends=('bash' 'electron12')
-makedepends=('gendesk' 'npm>=8.0.0' 'nodejs>=18.0.0' 'make' 'asar')
-source=("${pkgname}-${pkgver}.tar.gz::${_githuburl}/archive/refs/tags/v${pkgver}.tar.gz"
-    "${pkgname}.sh")
-sha256sums=('ba98bb6e4766c8a63ddba0254e4b9a80197196dea8b7f4a73693ba4602ebfdf4'
-            '200b71666dd12149ef2eee2426d7115ead1b460b7aed196f5b1c1354c5feba84')
-prepare() {
-    gendesk -q -f -n --categories "AudioVideo" --name "Nuclear Player" --exec "${pkgname}"
+_ghurl="https://github.com/nukeop/nuclear"
+license=('AGPL3')
+depends=(
+    'electron12'
+)
+makedepends=(
+    'gendesk'
+    'npm>=8.0.0'
+    'nvm'
+    'make'
+    'git'
+    'python'
+)
+source=(
+    "${pkgname}-${pkgver}::git+${_ghurl}#tag=v${pkgver}"
+    "${pkgname}.sh"
+)
+sha256sums=('SKIP'
+            'b3c8c080b48b5ecf1e3ed83493495f9e04c955c3976fe87ad8b646a7134e7840')
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install 18
+    nvm use 18
 }
 build() {
-    cd "${srcdir}/${pkgname%-player}-${pkgver}"
-    sed -e 's|"AppImage",|"AppImage"|g;s| --publish onTag||g;s|env.VERSION|version|g' \
-        -e '157,160d' \
+    _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
+    npm ci --cache "${srcdir}/npm-cache"
     npm run build:linux
 }
 package() {
-    install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm755 -d "${pkgdir}/opt/${pkgname}"
-    cp -r "${srcdir}/${pkgname%-player}-${pkgver}/release/linux-unpacked/resources" "${pkgdir}/opt/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname%-player}-${pkgver}/packages/app/resources/media/1024x1024.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    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 -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 88d205db65ac..75bacf749182 100644
--- a/nuclear-player.sh
+++ b/nuclear-player.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron12
-_ASAR="/opt/nuclear-player/resources/app.asar"
+APPDIR="/usr/lib/nuclear-player"
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else