From e4760cee1db3e950c8094df006b9c70475c5e175 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Mon, 28 Aug 2023 15:18:06 +0200 Subject: [PATCH] bugfix: anchored pattern did not allow additional _ before number part --- App/tools/getVersion.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/App/tools/getVersion.pl b/App/tools/getVersion.pl index 10352be..ce2adde 100755 --- a/App/tools/getVersion.pl +++ b/App/tools/getVersion.pl @@ -243,11 +243,11 @@ sub parse_git_output { $version = "$major.$minor.$patch"; say STDERR "Checking tag $line => version $version"; } - elsif ($line =~ /^[a-zA-Z]+[a-zA-Z0-9]*_([0-9]+)_([0-9]+)(_([0-9]+))?$/) { + elsif ($line =~ /^([a-zA-Z][a-zA-Z0-9]*_)+([0-9]+)_([0-9]+)(_([0-9]+))?$/) { $tag = $line; - my $major = $1; - my $minor = $2; - my $patch = $4 || "0"; + my $major = $2; + my $minor = $3; + my $patch = $5 || "0"; $version = "$major.$minor.$patch"; say STDERR "Checking tag $line => version $version"; }