packaging update

2 files changed, 6 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 397d1a0a7654..bcf6374fa67d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = neovim-trouble-git
 	pkgdesc = A pretty diagnostics list for Neovim powered by LSP
-	pkgver = r114.c298a17
+	pkgver = 2.8.0.r6.g40aad00
 	pkgrel = 1
 	url = https://github.com/folke/trouble.nvim
 	install = trouble.install
diff --git a/PKGBUILD b/PKGBUILD
index 7a45a60e0ded..eebf40dcee8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
 
 pkgname=neovim-trouble-git
-pkgver=r114.c298a17
+pkgver=2.8.0.r6.g40aad00
 pkgrel=1
 pkgdesc="A pretty diagnostics list for Neovim powered by LSP"
 arch=('any')
@@ -21,14 +21,12 @@ validpgpkeys=(
 )
 
 pkgver() {
-	cd "$pkgname"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	git -C "$pkgname" describe --long --tags --match "v[0-9]*" | sed 's/^v//;s/-/.r/;s/-/./'
 }
 
 package() {
 	cd "$pkgname"
-	find lua plugin \
-		-type f \
-		-exec install -Dm644 '{}' "$pkgdir/usr/share/nvim/runtime/{}" \;
-	install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+	local dirs=(lua plugin)
+	find "${dirs[@]}" -type f -exec install -Dvm644 '{}' "$pkgdir/usr/share/nvim/runtime/{}" \;
+	install -Dvm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
 }