update to 5.0.0

3 files changed, 24 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d1ebb3094a4..f8fc2a773fb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
 pkgbase = altus
 	pkgdesc = Desktop client for WhatsApp Web with themes, notifications and multiple account support
-	pkgver = 4.8.6
-	pkgrel = 6
+	pkgver = 5.0.0
+	pkgrel = 1
 	url = https://github.com/amanharwara/altus
 	arch = any
-	license = GPL3
+	license = GPL-3.0-only
 	makedepends = yarn
 	makedepends = npm
 	makedepends = nvm
 	makedepends = gendesk
 	makedepends = git
-	depends = electron22
+	depends = electron28
+	depends = nodejs
 	conflicts = altus
-	source = altus.git::git+https://github.com/amanharwara/altus.git#tag=4.8.6
+	source = altus.git::git+https://github.com/amanharwara/altus.git#tag=5.0.0
 	source = altus.sh
 	sha256sums = SKIP
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8
 
 pkgname = altus
diff --git a/PKGBUILD b/PKGBUILD
index 8193e8d919f5..fd0ec41063d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=altus
 _pkgname=Altus
-pkgver=4.8.6
-_electronversion=22
+pkgver=5.0.0
+_electronversion=28
 _nodeversion=18
-pkgrel=6
+pkgrel=1
 pkgdesc="Desktop client for WhatsApp Web with themes, notifications and multiple account support"
 arch=('any')
 url="https://github.com/amanharwara/altus"
-license=('GPL3')
+license=('GPL-3.0-only')
 conflicts=("${pkgname}")
 depends=(
-    'electron22'
+    "electron${_electronversion}"
+    'nodejs'
 )
 makedepends=(
     'yarn'
@@ -25,7 +26,7 @@ source=(
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
@@ -43,15 +44,18 @@ build() {
     export npm_config_build_from_source=true
     export ELECTRON_SKIP_BINARY_DOWNLOAD=1
     export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
-    export ELECTRONVERSION="${_electronversion}"
+    export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
+    export npm_config_disturl=https://electronjs.org/headers
+    HOME="${srcdir}/.electron-gyp"
     # .yarnrc.yml existed.
     yarn install
-    yarn run build
+    yarn run package
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}.git/public/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm755 -d "${pkgdir}/usr/lib/${pkgname}"
+    cp -r "${srcdir}/${pkgname}.git/out/${_pkgname}-linux-"*/resources/app "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/public/assets/icons/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -Dm644 "${srcdir}/${pkgname}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file
diff --git a/altus.sh b/altus.sh
index aacd8f895847..0d20cddc70ca 100644
--- a/altus.sh
+++ b/altus.sh
@@ -8,8 +8,7 @@ export ELECTRON_IS_DEV=0
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_ASAR}" "$@"
+    exec electron@electronversion@ "${_ASAR}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit
\ No newline at end of file
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file