make pkgver use tags in future like in wayst/x11 packages

2 files changed, 10 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2bc9b1724137..4459f47b63e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wayst-git
 	pkgdesc = Simple terminal emulator for Wayland and X11 with OpenGL rendering and minimal dependencies.
-	pkgver = r146.18a038b
+	pkgver = r222.4143e35
 	pkgrel = 1
 	url = https://github.com/91861/wayst
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index e2d2f89d7475..0226dd5f0484 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,8 @@
 # Maintainer: Antonín Dach <dach@protonmail.com>
+# Contributor: Vincent Grande <shoober420@gmail.com>
+
 pkgname=wayst-git
-pkgver=r146.18a038b
+pkgver=r222.4143e35
 pkgrel=1
 pkgdesc='Simple terminal emulator for Wayland and X11 with OpenGL rendering and minimal dependencies.'
 arch=('x86_64')
@@ -15,13 +17,15 @@ source=('git+https://github.com/91861/wayst.git#branch=master')
 md5sums=('SKIP')
 
 pkgver() {
-	cd "$srcdir/wayst"
-#	printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd wayst
+	( 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)"
+	)
 }
 
 build() {
-	cd "$srcdir/wayst"
+	cd wayst
 	make
 }
 
@@ -29,5 +33,4 @@ package() {
 	cd "$srcdir/wayst"
 	mkdir -p "$pkgdir/usr/bin"
 	make INSTALL_DIR="$pkgdir/usr/bin" install
-	#install -Dm 755 wayst "$pkgdir"/usr/bin/wayst
 }