X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=scripts%2Fgetver.sh;h=4643ca63ff0bb43b344fa4f9dfef383567c128ff;hb=0fc59fbed1a797c8bd6072d1f5df15d37c6e3cd4;hp=19c8c05cde7658702a0ecc33ae849d953e15d5ff;hpb=be42404637c60969a547d7ecd98ea24882688b14;p=openwrt.git diff --git a/scripts/getver.sh b/scripts/getver.sh index 19c8c05cde..4643ca63ff 100755 --- a/scripts/getver.sh +++ b/scripts/getver.sh @@ -11,14 +11,14 @@ 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 }')" + [ -e .git ] || return 1 + REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')" REV="${REV:+r$REV}" [ -n "$REV" ] }