fix errors

3 files changed, 35 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 354f0df08de4..df38d323100a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = altus
 	pkgdesc = Desktop client for WhatsApp Web with themes, notifications and multiple account support
 	pkgver = 4.8.6
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/amanharwara/altus
 	arch = any
 	license = GPL3
 	makedepends = yarn
 	makedepends = npm
-	makedepends = nodejs>=18.11.18
+	makedepends = nvm
 	makedepends = gendesk
-	depends = bash
+	makedepends = git
 	depends = electron22
 	conflicts = altus
-	source = altus-4.8.6.tar.gz::https://github.com/amanharwara/altus/archive/refs/tags/4.8.6.tar.gz
+	source = altus-4.8.6::git+https://github.com/amanharwara/altus.git#tag=4.8.6
 	source = altus.sh
-	sha256sums = ca5cb6f78df1a04beb1113d152171db8d2bab7d41d65658ff511af4de9dc0171
-	sha256sums = 6b70548f28be57598013faceba7b82aaf5ffed534d049f90b3eb891e95b75cb0
+	sha256sums = SKIP
+	sha256sums = 97d22512b105afc6ca0441342fb615b561816279e0a6922be82b1e3fff53cb2b
 
 pkgname = altus
diff --git a/PKGBUILD b/PKGBUILD
index 1c2bb82536a1..54a13ba9a8c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,44 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=altus
 pkgver=4.8.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Desktop client for WhatsApp Web with themes, notifications and multiple account support"
 arch=('any')
 url="https://github.com/amanharwara/altus"
 license=('GPL3')
 conflicts=("${pkgname}")
-depends=('bash' 'electron22')
-makedepends=('yarn' 'npm' 'nodejs>=18.11.18' 'gendesk')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/${pkgver}.tar.gz"
-    "${pkgname}.sh")
-sha256sums=('ca5cb6f78df1a04beb1113d152171db8d2bab7d41d65658ff511af4de9dc0171'
-            '6b70548f28be57598013faceba7b82aaf5ffed534d049f90b3eb891e95b75cb0')
-prepare() {
-    gendesk -q -f -n --categories "Network" --name "Altus" --exec "${pkgname}"
+depends=(
+    'electron22'
+)
+makedepends=(
+    'yarn'
+    'npm'
+    'nvm'
+    'gendesk'
+    'git'
+)
+source=(
+    "${pkgname}-${pkgver}::git+${url}.git#tag=${pkgver}"
+    "${pkgname}.sh"
+)
+sha256sums=('SKIP'
+            '97d22512b105afc6ca0441342fb615b561816279e0a6922be82b1e3fff53cb2b')
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install 18
+    nvm use 18
 }
 build() {
+    _ensure_local_nvm
+    gendesk -q -f -n --categories "Network" --name "Altus" --exec "${pkgname}"
     cd "${srcdir}/${pkgname}-${pkgver}"
     yarn
     yarn build
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/public/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
diff --git a/altus.sh b/altus.sh
index 92e57a3972f7..90f7e27153b7 100644
--- a/altus.sh
+++ b/altus.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron22
-_ASAR="/opt/altus/resources/app.asar"
+APPDIR="/usr/lib/altus"
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else