X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=version-gen.sh;h=d7c6a7655e28fd5e311a08a2911ddd4ddb1a773a;hb=db35efb33e81d0a013e09a8a6ffa362ad5962f7c;hp=b09be8e78227f350edbe8fc6bf96634f67a0a057;hpb=218c57128f2e54960133cff3e774b5ef9944068a;p=collectd.git diff --git a/version-gen.sh b/version-gen.sh index b09be8e7..d7c6a765 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -1,13 +1,13 @@ #!/bin/sh -DEFAULT_VERSION="5.5.0.git" +DEFAULT_VERSION="5.5.1.git" -VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" +if [ -d .git ]; then + VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`" +fi if test -z "$VERSION"; then VERSION="$DEFAULT_VERSION" fi -VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`" - printf "%s" "$VERSION"