Improve pkgver()

2 files changed, 5 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0405920abe9..231b24eacaab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Dec 27 08:57:44 UTC 2018
+# Fri Dec 28 02:27:10 UTC 2018
 pkgbase = python-ezpadova-git
 	pkgdesc = A python package that allows you to download PADOVA isochrones directly from their website
 	pkgver = r59.1b71cd7
diff --git a/PKGBUILD b/PKGBUILD
index 4ef724969fd8..f3558ed22c90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,10 @@ _gitname=ezpadova
 pkgver() {
     cd "${srcdir}/${_gitname}"
 
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    ( set -o pipefail
+      git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+      printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    )
 }
 
 prepare() {