| diff -aruN a/version.sh b/version.sh |
| --- a/version.sh 2011-11-04 03:53:29.000000000 -0700 |
| +++ b/version.sh 2011-12-15 14:17:51.000000000 -0800 |
| @@ -1,20 +1,17 @@ |
| #!/bin/sh |
| |
| VERSION="0.9.22" |
| -OUT="$1" |
| - |
| -if head=`git rev-parse --verify HEAD 2>/dev/null`; then |
| - git update-index --refresh --unmerged > /dev/null |
| - descr=$(git describe) |
| |
| - # on git builds check that the version number above |
| - # is correct... |
| - [ "${descr%%-*}" = "v$VERSION" ] || exit 2 |
| +SUFFIX= |
| +if test "x$1" = x--suffix; then |
| + shift |
| + SUFFIX="-$1" |
| + shift |
| +fi |
| +OUT="$1" |
| |
| - v="${descr#v}" |
| - if git diff-index --name-only HEAD | read dummy ; then |
| - v="$v"-dirty |
| - fi |
| +if test "x$SUFFIX" != 'x'; then |
| + v="$VERSION$SUFFIX" |
| else |
| v="$VERSION" |
| fi |
