update `pkgver` to match current latest git tag (`v.2.1.0`)

2 files changed, 9 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81d9ccaf2206..53d9f31406c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tmuxer-git
 	pkgdesc = Tmux layout generator and command executor
-	pkgver = 2.0.0
+	pkgver = 2.1.0
 	pkgrel = 1
 	url = https://github.com/tjhop/tmuxer
 	arch = any
@@ -12,6 +12,7 @@ pkgbase = tmuxer-git
 	depends = tmux
 	optdepends = openssh
 	provides = tmuxer
+	conflicts = tmuxer
 	source = tmuxer-git::git+https://github.com/tjhop/tmuxer.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index b54450902f39..96f06017819c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: TJ Hoplock <t.hoplock at gmail dot com>
 pkgname=tmuxer-git
-pkgver=2.0.0
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="Tmux layout generator and command executor"
 arch=('any')
@@ -10,12 +10,16 @@ depends=('bash' 'coreutils' 'sed' 'tmux')
 makedepends=('git')
 optdepends=('openssh')
 provides=('tmuxer')
+conflicts=('tmuxer')
 source=("$pkgname::git+https://github.com/tjhop/${pkgname%-*}.git")
 md5sums=('SKIP')
 
 pkgver() {
-    cd "$pkgname"
-    git describe --tags | sed 's/^v//g'
+  cd "$pkgname"
+  ( set -o pipefail
+    git describe --long 2>/dev/null | sed 's/^v//g;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 package() {