fix potential inconsistencies in toolchain selection on linux 2.4

[openwrt.git] / scripts / getver.sh

diff --git a/scripts/getver.sh b/scripts/getver.sh
index c33505e..cd9b90a 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 export LANG=C
 #!/usr/bin/env bash
 export LANG=C

+export LC_ALL=C

 [ -n "$TOPDIR" ] && cd $TOPDIR
 
 try_version() {
 [ -n "$TOPDIR" ] && cd $TOPDIR
 
 try_version() {


@@ -10,17 +11,24 @@ try_version() {
 
 try_svn() {
        [ -d .svn ] || return 1
 
 try_svn() {
        [ -d .svn ] || return 1

-       REV="$(svn info | awk '/^Revision:/ { print $2 }')"
+       REV="$(svn info | awk '/^Last Changed Rev:/ { print $4 }')"

        REV="${REV:+r$REV}"
        [ -n "$REV" ]
 }
 
 try_git() {
        [ -d .git ] || return 1
        REV="${REV:+r$REV}"
        [ -n "$REV" ]
 }
 
 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" ]
 }
 
        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"
 echo "$REV"