summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornfnty2016-02-15 21:12:58 +0100
committernfnty2016-02-15 21:12:58 +0100
commit6a02749b1790275b4ce8cda38ec105b1dbd66bdd (patch)
tree008cf16f66d051ebc8f2edd4a0afe97f7e444ec0
parent3d665fe00957c719c9fa27bea8da6f7e0d17893e (diff)
downloadaur-6a02749b1790275b4ce8cda38ec105b1dbd66bdd.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 f66bb0792ccc..e537e338d37a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Feb 15 18:12:59 UTC 2016
+# Mon Feb 15 20:12:58 UTC 2016
pkgbase = tini-git
pkgdesc = A tiny but valid `init` for containers
pkgver = r1
diff --git a/PKGBUILD b/PKGBUILD
index ad681a41093d..c717f311e74d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,9 +18,10 @@ sha512sums=('SKIP')
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' )"
}
build() {