fix errors

3 files changed, 21 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b1fc77b57ef..6d4b4e0f4443 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = saberfy
 	pkgdesc = Application for match and import your Spotify favorite songs to BeatSaber
 	pkgver = 2.1.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/LoliE1ON/Saberfy
 	arch = x86_64
 	license = MIT
@@ -10,11 +10,12 @@ pkgbase = saberfy
 	makedepends = nvm
 	makedepends = git
 	depends = electron16
+	depends = nodejs
 	provides = saberfy
 	conflicts = saberfy
-	source = saberfy-2.1.0::git+https://github.com/LoliE1ON/Saberfy.git#tag=v2.1.0
+	source = saberfy.git::git+https://github.com/LoliE1ON/Saberfy.git#tag=v2.1.0
 	source = saberfy.sh
 	sha256sums = SKIP
-	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
+	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
 
 pkgname = saberfy
diff --git a/PKGBUILD b/PKGBUILD
index 57d1c8464191..899207b232dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=Saberfy
 pkgver=2.1.0
 _electronversion=16
 _nodeversion=16
-pkgrel=3
+pkgrel=4
 pkgdesc="Application for match and import your Spotify favorite songs to BeatSaber"
 arch=('x86_64')
 url="https://github.com/LoliE1ON/Saberfy"
@@ -13,6 +13,7 @@ provides=("${pkgname}")
 conflicts=("${pkgname}")
 depends=(
     "electron${_electronversion}"
+    'nodejs'
 )
 makedepends=(
     'gendesk'
@@ -21,11 +22,11 @@ makedepends=(
     'git'
 )
 source=(
-    "${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver}"
+    "${pkgname}.git::git+${url}.git#tag=v${pkgver}"
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
+            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
@@ -38,8 +39,8 @@ build() {
         -e "s|@appasar@|app|g" \
         -i "${srcdir}/${pkgname}.sh"
     _ensure_local_nvm
-    gendesk -f -n -q --categories "Utility" --name "${_pkgname}" --exec "${pkgname}"
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    gendesk -f -n -q --categories "Utility" --name "${_pkgname}" --exec "${pkgname} %U"
+    cd "${srcdir}/${_pkgname}.git"
     export npm_config_build_from_source=true
     export npm_config_cache="${srcdir}/.npm_cache"
     export ELECTRON_SKIP_BINARY_DOWNLOAD=1
@@ -47,12 +48,12 @@ build() {
     export ELECTRONVERSION="${_electronversion}"
     npm install
     npm run package
-    sed "s|reg.exe|reg|g" -i "${srcdir}/${_pkgname}-${pkgver}/out/${_pkgname}-linux-x64/resources/app/.webpack/main/index.js"
+    sed "s|reg.exe|reg|g" -i "${srcdir}/${_pkgname}.git/out/${_pkgname}-linux-x64/resources/app/.webpack/main/index.js"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/out/${_pkgname}-linux-x64/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname}/swiftshader"
-    cp -r "${srcdir}/${_pkgname}-${pkgver}/out/${_pkgname}-linux-x64/resources/app" "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${_pkgname}.git/out/${_pkgname}-linux-x64/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname}/swiftshader"
+    cp -r "${srcdir}/${_pkgname}.git/out/${_pkgname}-linux-x64/resources/app" "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/${_pkgname}.git/LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/saberfy.sh b/saberfy.sh
index 2ec4412e5c4f..aacd8f895847 100644
--- a/saberfy.sh
+++ b/saberfy.sh
@@ -1,14 +1,15 @@
-#!/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
+cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    cd "${_APPDIR}"
     exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    cd "${_APPDIR}"
     exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
\ No newline at end of file
+fi
+exit
\ No newline at end of file