X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=version-gen.sh;h=2083ec38d6dd8a5d3bb4cdfe149507b45c670c36;hb=e37293e6675221d07b2fbda7751aae0b23c6cb6b;hp=b09be8e78227f350edbe8fc6bf96634f67a0a057;hpb=9ad5eefaa9dcc557c9117f8692cec1792f7ac7f0;p=collectd.git diff --git a/version-gen.sh b/version-gen.sh index b09be8e7..2083ec38 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -1,13 +1,13 @@ #!/bin/sh -DEFAULT_VERSION="5.5.0.git" +DEFAULT_VERSION="5.7.0.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"