From 50dd5baeebfe66cc64100c8209b28760439299e6 Mon Sep 17 00:00:00 2001 From: William Pursell Date: Thu, 28 Dec 2017 10:45:28 -0800 Subject: [PATCH] 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. --- version-gen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-gen.sh b/version-gen.sh index f16e66168..710795f48 100755 --- 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 -- 2.47.2