Fixed pkgver function

2 files changed, 9 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32d9da08b857..3f791076ac5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep 27 18:15:52 UTC 2016
+# Thu Oct 27 20:38:58 UTC 2016
 pkgbase = oktopi-git
 	pkgdesc = A fork of Pacman’s GUI Octopi for Chakra.
-	pkgver = 9895a4b5
-	pkgrel = 2
+	pkgver = r1.9895a4b
+	pkgrel = 1
 	url = http://gitorious.org/chakra/oktopi
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 690bc9028bd9..cad84686bd6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Piotr Rogoża <rogoza dot piotr at gmail dot com>
 
 pkgname=oktopi-git
-pkgver=9895a4b5
-pkgrel=2
+pkgver=r1.9895a4b
+pkgrel=1
 pkgdesc='A fork of Pacman’s GUI Octopi for Chakra.'
 arch=('i686' 'x86_64')
 url='http://gitorious.org/chakra/oktopi'
@@ -23,7 +23,10 @@ pkgver(){
   fi
 
   cd "$srcdir"/$_gitname
-  git describe --always | sed 's|-|.|g'
+  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"