X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=scripts%2Fgetver.sh;h=8bb384bd538fbc4a3a249d666cd8dc216e7fb63d;hp=82fe62b189230f32c4cefd2e31b99636f3f9e70b;hb=e30e495bb1cd6df96e6b246a89c8eade514031c7;hpb=25040fe2c0cc788e36c2f4a4d82e84ddea8a71a1 diff --git a/scripts/getver.sh b/scripts/getver.sh index 82fe62b18..8bb384bd5 100755 --- a/scripts/getver.sh +++ b/scripts/getver.sh @@ -11,17 +11,24 @@ try_version() { 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="$(git-log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $2); print $2 }')" + REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')" 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"