update to 7.0.0.beta.5.r7.gba534053

3 files changed, 27 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 40930dde8c12..c6aaf580d327 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = elevate-git
-	pkgdesc = A sport app to Elevate your training experience and goals! Track your fitness and progressions over time. Analyse deeper your activities. And more...
-	pkgver = r4063.ba534053
+	pkgdesc = A sport app to 'Elevate' your training experience and goals! Track your fitness and progressions over time. Analyse deeper your activities. And more...
+	pkgver = 7.0.0.beta.5.r7.gba534053
 	pkgrel = 1
 	url = https://thomaschampagne.github.io/elevate-docs/
 	arch = any
@@ -12,9 +12,9 @@ pkgbase = elevate-git
 	depends = bash
 	depends = electron17
 	depends = hicolor-icon-theme
-	source = git+https://github.com/thomaschampagne/elevate.git
+	source = elevate.git::git+https://github.com/thomaschampagne/elevate.git
 	source = elevate.sh
 	sha256sums = SKIP
-	sha256sums = 6abbee57f24ea2af0a67dab357ba0b4961cafcd319040411ea3195c7e7706b74
+	sha256sums = 56d7c956d9b4e37347d3218d2634a1a2580942a546ddb957c47c6294991ea963
 
 pkgname = elevate-git
diff --git a/PKGBUILD b/PKGBUILD
index 3317eceb88a1..c30daacaed16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,38 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=elevate-git
-pkgver=r4063.ba534053
+pkgver=7.0.0.beta.5.r7.gba534053
 pkgrel=1
-pkgdesc="A sport app to "Elevate" your training experience and goals! Track your fitness and progressions over time. Analyse deeper your activities. And more..."
+pkgdesc="A sport app to 'Elevate' your training experience and goals! Track your fitness and progressions over time. Analyse deeper your activities. And more..."
 arch=('any')
 url="https://thomaschampagne.github.io/elevate-docs/"
 _githuburl="https://github.com/thomaschampagne/elevate"
 license=('MIT')
-makedepends=('npm' 'git' 'nodejs>=16' 'gendesk')
 depends=('bash' 'electron17' 'hicolor-icon-theme')
-source=("git+${_githuburl}.git"
+makedepends=('npm' 'git' 'nodejs>=16' 'gendesk')
+source=("${pkgname//-/.}::git+${_githuburl}.git"
     "${pkgname%-git}.sh")
 sha256sums=('SKIP'
-            '6abbee57f24ea2af0a67dab357ba0b4961cafcd319040411ea3195c7e7706b74')
+            '56d7c956d9b4e37347d3218d2634a1a2580942a546ddb957c47c6294991ea963')
 pkgver() {
-    cd "${srcdir}/${pkgname%-git}"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "${srcdir}/${pkgname//-/.}"
+    printf "%s" "$(git describe --tags | sed 's/\w\+\///g;s/\([^-]*-g\)/r\1/;s/-/./g;s/v//g')"
 }
 build() {
-    cd "${srcdir}/${pkgname%-git}"
+    gendesk -q -f -n --categories "Utility" --name "${pkgname%-git}" --exec "${pkgname%-git}"
+    cd "${srcdir}/${pkgname//-/.}"
     npm install
-    cd "${srcdir}/${pkgname%-git}/desktop"
+    cd "${srcdir}/${pkgname//-/.}/desktop"
     npm run build:package:linux
 }
 package() {
-    asar extract "${srcdir}/${pkgname%-git}/desktop/package/linux-unpacked/resources/app.asar" "${srcdir}/app.asar.unpacked"
-    cp -r "${srcdir}/${pkgname%-git}/desktop/package/linux-unpacked/resources/app.asar.unpacked" "${srcdir}"
-    asar pack "${srcdir}/app.asar.unpacked" "${srcdir}/${pkgname%-git}.asar"
     install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}"
-    install -Dm644 "${srcdir}/${pkgname%-git}.asar" -t "${pkgdir}/opt/${pkgname%-git}"
+    install -Dm644 "${srcdir}/${pkgname//-/.}/desktop/package/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-git}/resources"
+    cp -r "${srcdir}/${pkgname//-/.}/desktop/package/linux-unpacked/resources/app.asar.unpacked" "${pkgdir}/opt/${pkgname%-git}/resources"
+    install -Dm644 "${srcdir}/${pkgname//-/.}/desktop/package/linux-unpacked/swiftshader/"* -t "${pkgdir}/opt/${pkgname%-git}/swiftshader"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512;do
-        install -Dm644 "${srcdir}/${pkgname%-git}/desktop/package/.icon-set/icon_${_icons}.png" \
+        install -Dm644 "${srcdir}/${pkgname//-/.}/desktop/package/.icon-set/icon_${_icons}.png" \
             "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-git}.png"
     done
-    gendesk -f -n --categories "Utility" --name "${pkgname%-git}" --exec "${pkgname%-git}"
     install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname%-git}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
+    install -Dm644 "${srcdir}/${pkgname//-/.}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
\ No newline at end of file
diff --git a/elevate.sh b/elevate.sh
index cd6164a99019..612e3d9ef1ea 100644
--- a/elevate.sh
+++ b/elevate.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron17
-_ASAR="/opt/elevate/elevate.asar"
+APPDIR="/opt/elevate"
+export PATH="${APPDIR}:${APPDIR}/usr/sbin:${PATH}"
+export XDG_DATA_DIRS="./share/:/usr/share/gnome:/usr/local/share/:/usr/share/:${XDG_DATA_DIRS}"
+export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
+export XDG_DATA_DIRS="${APPDIR}"/usr/share/:"${XDG_DATA_DIRS}":/usr/share/gnome/:/usr/local/share/:/usr/share/
+export GSETTINGS_SCHEMA_DIR="${APPDIR}/usr/share/glib-2.0/schemas:${GSETTINGS_SCHEMA_DIR}"
+_ASAR="${APPDIR}/resources/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else