Fix quoting in version.sh

oldabi
Mans Rullgard 14 years ago
parent daed21a17e
commit f318ee3e37
  1. 20
      version.sh

@ -2,32 +2,32 @@
# check for SVN revision number # check for SVN revision number
revision=$(cd "$1" && cat snapshot_version 2> /dev/null) 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" && 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" && 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" && sed -n -e '/^dir$/{n
p p
q q
}' .svn/entries 2>/dev/null) }' .svn/entries 2>/dev/null)
test $revision && revision=SVN-r$revision test "$revision" && revision=SVN-r$revision
# check for git svn revision number # 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) 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 fi
# check for git short hash # check for git short hash
if ! test $revision; then if ! test "$revision"; then
revision=$(cd "$1" && git describe --always 2> /dev/null) revision=$(cd "$1" && git describe --always 2> /dev/null)
test $revision && revision=git-$revision test "$revision" && revision=git-$revision
fi fi
# no revision number found # no revision number found
test $revision || revision=UNKNOWN test "$revision" || revision=UNKNOWN
# releases extract the version number from the VERSION file # releases extract the version number from the VERSION file
version=$(cd "$1" && cat VERSION 2> /dev/null) version=$(cd "$1" && cat VERSION 2> /dev/null)
test $version || version=$revision test "$version" || version=$revision
test -n "$3" && version=$version-$3 test -n "$3" && version=$version-$3

Loading…
Cancel
Save