Fix pkgver ignoring the latest tag

Patch test to warn on mismatched version

1 files changed, 42 insertions, 30 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4b26bd1a5796..7c36b1ebc914 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,27 @@
 # Maintainer: ObserverOfTime <chronobserver@disroot.org>
 
-_pkgname=yarn-completion
 pkgname=yarn-completion-git
-pkgver=v0.16.0.r2.g5bf2968
-pkgrel=2
+pkgver=v0.17.0.r0.g30262cf
+pkgrel=3
 pkgdesc='Bash completion for Yarn'
 url='https://github.com/dsifford/yarn-completion'
 arch=('any')
 license=('MIT')
 depends=('bash' 'bash-completion' 'yarn')
 makedepends=('git')
-source=('git+https://github.com/dsifford/yarn-completion.git')
+source=("git+${url}.git")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_pkgname"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd ${pkgname%-git}
+  # using git rev-list to force the latest tag to show up
+  git describe --long "$(git rev-list --tags --max-count=1)" | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd "$srcdir/$_pkgname"
+  cd ${pkgname%-git}
   patch -p0 tests/test <<'EOF'
-@@ -7,7 +7,7 @@ COMPLETION_SRC="$TEST_DIR"/../yarn-completion.bash
+@@ -7,27 +7,23 @@ COMPLETION_SRC="$TEST_DIR"/../yarn-completion.bash
  # shellcheck source=./utils.sh
  source "$TEST_DIR"/utils.sh
  
@@ -30,36 +30,48 @@ prepare() {
  
  describe 'Environment checks'
  {
-@@ -18,12 +18,12 @@ describe 'Environment checks'
- 		expected=$(yarn --version)
- 		if [[ $actual != "${expected%-*}" ]]; then
- 			prepend '  | ' <<- EOF
+ 	it should match yarn version line in src file
+-	t=$(
+-		declare actual expected
+-		actual=$(sed -n 's/# Yarn Version: \([^ ]*\)/\1/p' "$COMPLETION_SRC")
+-		expected=$(yarn --version)
+-		if [[ $actual != "${expected%-*}" ]]; then
+-			prepend '  | ' <<- EOF
 -				ERROR: mismatched yarn version line in src file.
-+				WARNING: mismatched yarn version line in src file.
- 				
- 				expected: ${expected%-*}
- 				received: $actual
- 			EOF
+-				
+-				expected: ${expected%-*}
+-				received: $actual
+-			EOF
 -			exit 1
-+			exit 0
- 		fi
- 		exit 0
- 	)
-
+-		fi
+-		exit 0
+-	)
+-	passfail "$t"
++	declare actual expected
++	actual=$(sed -n 's/# Yarn Version: \([^ ]*\)/\1/p' "$COMPLETION_SRC")
++	expected=$(yarn --version)
++	if [[ $actual != "${expected%-*}" ]]; then
++		echo ..WARN
++		prepend '  | ' <<- EOF
++			WARNING: mismatched yarn version line in src file.
++			
++			expected: ${expected%-*}
++			received: $actual
++		EOF
++	fi
+ }
+ 
+ describe 'Checking top-level commands'
 EOF
 }
 
 check() {
-  cd "$srcdir/$_pkgname"
+  cd ${pkgname%-git}
   bash tests/test
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
-  install -Dm644 LICENSE \
-    "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-  install -Dm644 "$_pkgname.bash" \
-    "$pkgdir/usr/share/bash-completion/completions/yarn"
+  cd ${pkgname%-git}
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+  install -Dm644 "${pkgname%-git}.bash" "$pkgdir/usr/share/bash-completion/completions/yarn"
 }
-
-# vim:set ts=2 sw=2 et: