move ppp ifname fixup from pppoe.sh to ppp.sh, so that it applies to all other ppp...

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

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 82fe62b189230f32c4cefd2e31b99636f3f9e70b..19c8c05cde7658702a0ecc33ae849d953e15d5ff 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -18,10 +18,17 @@ try_svn() {
 
 try_git() {
        [ -d .git ] || return 1
-       REV="$(git-log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $2); print $2 }')"
+       REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $2); print $2 }')"
        REV="${REV:+r$REV}"
        [ -n "$REV" ]
 }
 
-try_version || try_svn || try_git || REV="unknown"
+try_hg() {
+       [ -d .hg ] || return 1
+       REV="$(hg log -r-1 --template '{desc}' | awk '{print $2}' | sed 's/\].*//')"
+       REV="${REV:+$REV}"
+       [ -n "$REV" ]
+}
+
+try_version || try_svn || try_git || try_hg || REV="unknown"
 echo "$REV"