diff options
| -rwxr-xr-x | version.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/version.sh b/version.sh index f45c60daae..3269e038a7 100755 --- a/version.sh +++ b/version.sh @@ -2,32 +2,32 @@ # check for SVN revision number revision=$(cd "$1" && cat snapshot_version 2> /dev/null) -test $revision || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep "Last Changed Rev" | cut -d' ' -f4) -test $revision || revision=$(cd "$1" && grep committed-rev .svn/entries 2>/dev/null | head -n 1 | cut -d '"' -f2) -test $revision || revision=$(cd "$1" && sed -n -e '/^dir$/{n +test "$revision" || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep "Last Changed Rev" | cut -d' ' -f4) +test "$revision" || revision=$(cd "$1" && grep committed-rev .svn/entries 2>/dev/null | head -n 1 | cut -d '"' -f2) +test "$revision" || revision=$(cd "$1" && sed -n -e '/^dir$/{n p q }' .svn/entries 2>/dev/null) -test $revision && revision=SVN-r$revision +test "$revision" && revision=SVN-r$revision # check for git svn revision number -if ! test $revision; then +if ! test "$revision"; then revision=$(cd "$1" && git svn find-rev HEAD 2> /dev/null) - test $revision && revision=git-svn-r$revision + test "$revision" && revision=git-svn-r$revision fi # check for git short hash -if ! test $revision; then +if ! test "$revision"; then revision=$(cd "$1" && git describe --always 2> /dev/null) - test $revision && revision=git-$revision + test "$revision" && revision=git-$revision fi # no revision number found -test $revision || revision=UNKNOWN +test "$revision" || revision=UNKNOWN # releases extract the version number from the VERSION file version=$(cd "$1" && cat VERSION 2> /dev/null) -test $version || version=$revision +test "$version" || version=$revision test -n "$3" && version=$version-$3 |