fix pkgver()

2 files changed, 7 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 548b9535d3f6..84dd4413906a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = spicetify-themes-git
 	pkgdesc = A community-driven collection of themes for spicetify
-	pkgver = r7.658997f
+	pkgver = r424.17d0670
 	pkgrel = 1
 	url = https://github.com/morpheusthewhite/spicetify-themes
 	install = spicetify-themes-git.install
diff --git a/PKGBUILD b/PKGBUILD
index 1db79427045e..303e1ff74937 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: morpheusthewhite <zffromGerace@hotmail.it>
 
 pkgname=spicetify-themes-git
-pkgver=r7.658997f
+pkgver=r424.17d0670
 pkgrel=1
 pkgdesc="A community-driven collection of themes for spicetify"
 arch=('any')
@@ -21,8 +21,11 @@ noextract=()
 md5sums=('SKIP')
 
 pkgver() {
-    cd "$srcdir"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "$pkgname"
+    ( set -o pipefail
+      git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+      printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    )
 }
 
 package() {