Bump version

Athena-OS · Oct 29, 2024 · d8ddaee · d8ddaee
1 parent 54391d6
commit d8ddaee
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/packages/applications/athena-welcome/PKGBUILD b/packages/applications/athena-welcome/PKGBUILD
@@ -1,17 +1,22 @@
 pkgname=athena-welcome
-pkgver=28.0da8a56
+pkgver=29.adcaf3d
 pkgrel=1
-pkgdesc="Welcome App for Athena."
+pkgdesc='Welcome App for Athena.'
 arch=('any')
-license=("GPL3")
+license=('GPL3')
 depends=('athena-config' 'cyber-toolkit' 'htb-toolkit' 'rate-mirrors' 'rsync')
 source=("git+https://github.com/Athena-OS/$pkgname.git")
 sha512sums=('SKIP')
 
 pkgver() {
   cd $pkgname
 
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+  ( set -o pipefail
+    git describe --long --tags --abbrev=7 2>/dev/null |
+      sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "%s.%s" "$(git rev-list --count HEAD)" \
+      "$(git rev-parse --short=7 HEAD)"
+  )
 }
 
 package() {
@@ -23,13 +28,13 @@ package() {
   mkdir -p "$pkgdir/usr/share/applications"
   mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/apps"
 
-  install -Dm644 "autostart/athena-welcome.desktop" "${pkgdir}/etc/skel/.config/autostart/"
-  #install -Dm755 "usr/bin/hacking-variables" "${pkgdir}/usr/bin/"
-  #install -Dm755 "usr/bin/role-viewer" "${pkgdir}/usr/bin/"
-  #install -Dm755 "usr/bin/tool-recipe" "${pkgdir}/usr/bin/"
-  install -Dm644 "share/applications/athena-welcome.desktop" "${pkgdir}/usr/share/applications/"
-  install -Dm644 "share/icons/hicolor/scalable/apps/athenaos-hello.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/"
-  cp -a "share/athena-welcome" "${pkgdir}/usr/share/"
+  install -Dm644 "autostart/athena-welcome.desktop" "$pkgdir/etc/skel/.config/autostart/"
+  #install -Dm755 "usr/bin/hacking-variables" "$pkgdir/usr/bin/"
+  #install -Dm755 "usr/bin/role-viewer" "$pkgdir/usr/bin/"
+  #install -Dm755 "usr/bin/tool-recipe" "$pkgdir/usr/bin/"
+  install -Dm644 "share/applications/athena-welcome.desktop" "$pkgdir/usr/share/applications/"
+  install -Dm644 "share/icons/hicolor/scalable/apps/athenaos.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/"
+  cp -a "share/athena-welcome" "$pkgdir/usr/share/"
 
   cat > "$pkgdir/usr/bin/$pkgname" << EOF
 #!/usr/bin/env bash