package cleanup

* cleaned up pkgver function
* added missing files

2 files changed, 16 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2ecf8a718b4..1b5c174520b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = fish-z-git
-	pkgdesc = Fish shell port of z, for directory jumping
-	pkgver = r121.d550028
+	pkgdesc = Fish port of z, for directory jumping
+	pkgver = 1.1.r58.g45a9ff6
 	pkgrel = 1
 	url = https://github.com/jethrokuan/z
 	arch = any
 	groups = fish-plugins
 	license = MIT
 	makedepends = git
-	depends = fish
+	depends = fish>=2.7.0
 	provides = fish-z
 	provides = z
 	conflicts = fish-z
@@ -17,4 +17,3 @@ pkgbase = fish-z-git
 	md5sums = SKIP
 
 pkgname = fish-z-git
-
diff --git a/PKGBUILD b/PKGBUILD
index f57e810c301a..26e1bfac0461 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,14 @@
-# Maintainer: lmartinez-mirror
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+
 pkgname=fish-z-git
-pkgver=r121.d550028
+pkgver=1.1.r58.g45a9ff6
 pkgrel=1
-pkgdesc="Fish shell port of z, for directory jumping"
+pkgdesc="Fish port of z, for directory jumping"
 arch=('any')
 url="https://github.com/jethrokuan/z"
 license=('MIT')
 groups=('fish-plugins')
-depends=('fish')
+depends=('fish>=2.7.0')
 makedepends=('git')
 provides=("${pkgname%-git}" 'z')
 conflicts=("${pkgname%-git}" 'z' 'zoxide')
@@ -15,14 +16,15 @@ source=("$pkgname::git+$url")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "$pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	## upstream has extra tags; filter them out with --match
+	git -C "$pkgname" describe --long --tags --match "[0-9]*" | sed 's/^v//;s/-/.r/;s/-/./'
 }
 
 package() {
-  cd "$pkgname"
-  find conf.d functions man \
-    -type f -exec install -Dm 644 '{}' "$pkgdir/etc/fish/{}" \;
-  install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+	cd "$pkgname"
+	install -Dm 644 conf.d/z.fish -t "$pkgdir/usr/share/fish/vendor_conf.d/"
+	install -Dm 644 functions/*.fish -t "$pkgdir/usr/share/fish/vendor_functions.d/"
+	install -Dm 644 man/man1/z.1 -t "$pkgdir/usr/share/man/man1/"
+	install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
 }