X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/21e17d6ad463edff7baf6e25a30041dcf22a8c4e..d25d480741c209b79f248c24d529447f1bf8b31e:/scripts/getver.sh 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" ] }