From 14232464193417a9e9fc6592837681f4e7b0ea5e Mon Sep 17 00:00:00 2001 From: downtownallday Date: Thu, 23 Jun 2022 17:46:50 -0400 Subject: [PATCH] Better handling of git formatted versions eg "v57a-6-g82599e5" --- tests/lib/installed-state.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/lib/installed-state.sh b/tests/lib/installed-state.sh index 40c8ff8a..83426aa5 100644 --- a/tests/lib/installed-state.sh +++ b/tests/lib/installed-state.sh @@ -12,11 +12,11 @@ parse_miab_version_string() { awk -F- ' /^v[0-9]+\./ { split($1,a,"."); print "MAJOR="substr(a[1],2); print "MINOR="a[2]; print "RELEASE="$2; next } -/^v[0-9]+[a-z]$/ { print "MAJOR="substr($1,2,length($1)-2); print "MINOR="substr($1,length($1))-"a"+1; print "RELEASE="; next } +$1 ~ /^v[0-9]+[a-z]$/ { print "MAJOR="substr($1,2,length($1)-2); print "MINOR="substr($1,length($1))-"a"+1; print "RELEASE="; next } -/^v[0-9]+[A-Z]$/ { print "MAJOR="substr($1,2,length($1)-2); print "MINOR="substr($1,length($1))-"A"+1; print "RELEASE="; next } +$1 ~ /^v[0-9]+[A-Z]$/ { print "MAJOR="substr($1,2,length($1)-2); print "MINOR="substr($1,length($1))-"A"+1; print "RELEASE="; next } -/^v[0-9]+$/ { print "MAJOR="substr($1,2); print "MINOR="; print "RELEASE="; next } +$1 ~ /^v[0-9]+$/ { print "MAJOR="substr($1,2); print "MINOR="; print "RELEASE="; next } { exit 1 }' >> "$tmpfile" <<< "$1"