openvpn: update to 2.3.11

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

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 7248ca77531be8c7b08b1450cf9140fee3ada37b..d0916713ad92a7a6f915fa5a281f3155bbfd5456 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -9,16 +9,9 @@ try_version() {
        [ -n "$REV" ]
 }
 
-try_svn() {
-       [ -d .svn ] || return 1
-       REV="$(svn info -r COMMITTED | awk '/^Revision:/ { print $2 }')"
-       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 }')"
+       git rev-parse --git-dir >/dev/null 2>&1 || return 1
+       REV="$(git describe --match reboot | sed "s/reboot-\([0-9]*\)-.*/\1/g")"
        REV="${REV:+r$REV}"
        [ -n "$REV" ]
 }
@@ -26,9 +19,9 @@ try_git() {
 try_hg() {
        [ -d .hg ] || return 1
        REV="$(hg log -r-1 --template '{desc}' | awk '{print $2}' | sed 's/\].*//')"
-       REV="${REV:+$REV}"
+       REV="${REV:+r$REV}"
        [ -n "$REV" ]
 }
 
-try_version || try_svn || try_git || try_hg || REV="unknown"
+try_version || try_git || try_hg || REV="unknown"
 echo "$REV"