From 14ef1c05ce7c04361d5ba278147fcb684ae65ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Fri, 17 May 2024 14:52:22 +0200 Subject: [PATCH] scripts: stricter tag matching in version.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order not to conflict with axosyslog-charts. Signed-off-by: László Várady --- scripts/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/version.sh b/scripts/version.sh index e4a6bed2a8..0779e0cd2e 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -29,7 +29,7 @@ cd $BASEDIR/../ if [ "$VERSION" != "" ]; then echo $VERSION | tr -d '\n' -elif [ -d .git ] && GIT_VERSION=$(git describe --tags --dirty --abbrev=7); then +elif [ -d .git ] && GIT_VERSION=$(git describe --match 'axosyslog-[0-9]*' --tags --dirty --abbrev=7); then echo $GIT_VERSION | sed 's/^axosyslog-//' | tr '-' '.' | tr -d '\n' else cat VERSION.txt | tr -d '\n'