Merge pull request #580 from wigyori/cc-libpcap

[15.05/openwrt.git] / scripts / getver.sh

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 19c8c05..0aebd29 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -11,15 +11,15 @@ 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="${REV:+r$REV}"
+       git rev-parse --git-dir >/dev/null 2>&1 || return 1
+       REV="$(git describe --tags | sed "s/v15.05.1-\([0-9]*\)-.*/\1/g")"
+       REV="${REV:+r$((REV+49254))}"
        [ -n "$REV" ]
 }
 
@@ -30,5 +30,5 @@ try_hg() {
        [ -n "$REV" ]
 }
 
-try_version || try_svn || try_git || try_hg || REV="unknown"
+try_version || try_git || try_hg || REV="unknown"
 echo "$REV"