X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=version-gen.sh;h=f16e66168c76d3ecb939d097a332af77e7b81bff;hp=45e5a53467fbdfe1c70ab454c5314cdbb5b2be0e;hb=1159cb5d383c55a80a0db100b8f7aadcf44740a5;hpb=e037711c39e610ecdfdac4ecbd7deca711a15d47 diff --git a/version-gen.sh b/version-gen.sh index 45e5a534..f16e6616 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -1,13 +1,13 @@ #!/bin/sh -DEFAULT_VERSION="5.5.3.git" +DEFAULT_VERSION="5.8.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"