Update pkgver() function

2 files changed, 14 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f17c6518c95..5463d96fc44f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rss2email-git
 	pkgdesc = A tool for delivering news from RSS feeds to your email program (development version)
-	pkgver = master
+	pkgver = latest
 	pkgrel = 1
 	url = https://pypi.python.org/pypi/rss2email
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index b85b1a920cd6..003ab061c8fe 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Ivan Zenin <i.zenin@gmx.com>
 
-pkgname="rss2email-git"
-pkgver=master
+pkgname=rss2email-git
+pkgver=latest
 pkgrel=1
-pkgdesc="A tool for delivering news from RSS feeds to your email program (development version)" 
+pkgdesc="A tool for delivering news from RSS feeds to your email program (development version)"
 arch=('i686' 'x86_64')
 url="https://pypi.python.org/pypi/rss2email"
 license=("GPL")
@@ -15,17 +15,20 @@ source=("git+git://github.com/wking/rss2email.git")
 md5sums=('SKIP')
 
 pkgver() {
-  cd rss2email
-  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "${srcdir}"/rss2email
+  ( set -o pipefail
+    git describe --long 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 package() {
-  cd rss2email
+  cd "${srcdir}"/rss2email
   python setup.py install \
       --prefix=/usr \
-      --root="$pkgdir"
+      --root="${pkgdir}"
   find "${pkgdir}" -type d -name .git -exec rm -r '{}' +
-  install -D -m644 ./README "$pkgdir"/usr/share/rss2email/README
-  install -m644 ./CHANGELOG "$pkgdir"/usr/share/rss2email
-  install -D -m644 ./r2e.1 "$pkgdir"/usr/share/man/man1/r2e.1
+  install -D -m644 ./README "${pkgdir}"/usr/share/rss2email/README
+  install -m644 ./CHANGELOG "${pkgdir}"/usr/share/rss2email
+  install -D -m644 ./r2e.1 "${pkgdir}"/usr/share/man/man1/r2e.1
 }