X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=version-gen.sh;h=e106d80503b12dfdf9e3fc44437651d14b9d6638;hb=b7e942f07f8cc3b4915aa95477aead8b5a372879;hp=e0ad124e237e063416099a588ada8fc4158e7d44;hpb=e0e307657d6b751d6beb5afb92c9359a6df7f5e8;p=collectd.git diff --git a/version-gen.sh b/version-gen.sh index e0ad124e..e106d805 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -1,13 +1,13 @@ #!/bin/sh -DEFAULT_VERSION="5.5.1.git" +DEFAULT_VERSION="5.6.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"