X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=scripts%2Fgetver.sh;h=8bb384bd538fbc4a3a249d666cd8dc216e7fb63d;hp=7248ca77531be8c7b08b1450cf9140fee3ada37b;hb=d46e7f9d2ee61fe2244ea0af071cdf88296115f8;hpb=21e17d6ad463edff7baf6e25a30041dcf22a8c4e diff --git a/scripts/getver.sh b/scripts/getver.sh index 7248ca775..8bb384bd5 100755 --- a/scripts/getver.sh +++ b/scripts/getver.sh @@ -11,14 +11,14 @@ try_version() { try_svn() { [ -d .svn ] || return 1 - REV="$(svn info -r COMMITTED | 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" ] }