diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/getver.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/getver.sh b/scripts/getver.sh index 6cf7797519..445a43e8b8 100755 --- a/scripts/getver.sh +++ b/scripts/getver.sh @@ -18,8 +18,7 @@ try_svn() { try_git() { git rev-parse --git-dir >/dev/null 2>&1 || return 1 - REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')" - REV="${REV:+r$REV}" + REV="$(git describe --tags | sed "s/trunk-\([0-9]*-.*\)/\1/g")" [ -n "$REV" ] } @@ -30,5 +29,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" |