ar71xx: reclaim the 'user_property' partition on WHR-* boards

[openwrt.git] / scripts / getver.sh

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 7248ca7..8bb384b 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -11,14 +11,14 @@ try_version() {
 
 try_svn() {
        [ -d .svn ] || return 1
 
 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="${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" ]
 }
        REV="${REV:+r$REV}"
        [ -n "$REV" ]
 }