summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornfnty2016-02-15 21:10:53 +0100
committernfnty2016-02-15 21:10:53 +0100
commit20a0aed142786207ef43e4e1ac9dc8640256b8fb (patch)
tree91faaa0b2dad8f97c344c58b5752d7fb63d76073
parent5a6a3025e4e1b12f62271c971d7fde77923e2fc3 (diff)
downloadaur-20a0aed142786207ef43e4e1ac9dc8640256b8fb.tar.gz
Refactor pkgver()
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD7
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 18f76393bfb1..638824737852 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Feb 2 14:26:54 UTC 2016
+# Mon Feb 15 20:10:53 UTC 2016
pkgbase = heka-git
pkgdesc = Data collection and processing made easy
pkgver = r1
diff --git a/PKGBUILD b/PKGBUILD
index c09d7cb2d3a4..56b33c459e39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -37,9 +37,10 @@ install='heka.install'
pkgver() {
cd "${srcdir}/${srcname}"
- printf 'r%s.%s\n' \
- "$( git rev-list HEAD | wc --lines )" \
- "$( git describe --always | sed 's/-/./g' )"
+ printf 'r%s.%s.%s\n' \
+ "$( git rev-list --count 'HEAD' )" \
+ "$( git log --max-count='1' --pretty='format:%ct' )" \
+ "$( git rev-parse --short 'HEAD' )"
}
prepare() {