scripts/getver.sh: simplify revision calculation

[openwrt/staging/hauke.git] / scripts / getver.sh

diff --git a/scripts/getver.sh b/scripts/getver.sh
index d3b68c86347d0801f61fda20f114eea7058d8a87..340ed6862cf7cc566262ea64bfdc33196926fc4d 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -11,14 +11,15 @@ try_version() {
 
 try_git() {
        git rev-parse --git-dir >/dev/null 2>&1 || return 1
-       REV="$(git describe | sed "s/reboot-\([0-9]*\)-.*/\1/g")"
+       REV="$(git rev-list reboot..HEAD --count)"
+       REV="${REV:+r$REV}"
        [ -n "$REV" ]
 }
 
 try_hg() {
        [ -d .hg ] || return 1
        REV="$(hg log -r-1 --template '{desc}' | awk '{print $2}' | sed 's/\].*//')"
-       REV="${REV:+$REV}"
+       REV="${REV:+r$REV}"
        [ -n "$REV" ]
 }