Cleanup version-gen.sh

Existing script matches too generously.  eg, an annotated
tag 'foo-connectd-bar' will not be filtered.  Effectively,
this commit replaces 'grep collectd' with 'grep ^collectd-',
but removes the grep and does the filtering directly in sed.

diff --git a/version-gen.sh b/version-gen.sh
index f16e66168c76d3ecb939d097a332af77e7b81bff..710795f4879fe4c24d32111d8541a4d02897f327 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -3,7 +3,7 @@
 DEFAULT_VERSION="5.8.0.git"
 
 if [ -d .git ]; then
-       VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
+       VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | sed -e '/^collectd-/!d' -e 's///' -e 'y/-/./'`"
 fi
 
 if test -z "$VERSION"; then