common: calculate major, minor and patch versions correctly by using …

…cut command Signed-off-by: Muvaffak Onus <me@muvaf.com>
upbound · Oct 11, 2022 · 3152836 · 3152836
1 parent b2a9a2d
commit 3152836
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/makelib/common.mk b/makelib/common.mk
@@ -226,9 +226,16 @@ export VERSION
 
 VERSION_REGEX := ^v\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)$$
 VERSION_VALID := $(shell echo "$(VERSION)" | grep -q '$(VERSION_REGEX)' && echo 1 || echo 0)
-VERSION_MAJOR := $(shell echo "$(VERSION)" | sed -e 's/$(VERSION_REGEX)/\1/')
-VERSION_MINOR := $(shell echo "$(VERSION)" | sed -e 's/$(VERSION_REGEX)/\2/')
-VERSION_PATCH := $(shell echo "$(VERSION)" | sed -e 's/$(VERSION_REGEX)/\3/')
+
+# Given "v0.17.0-3.gb4eee9f.dirty" it returns "0".
+VERSION_MAJOR := $(shell echo "$(VERSION)" | cut -d'.' -f1 | sed '1s/^.//')
+
+# Given "v0.17.0-3.gb4eee9f.dirty" it returns "17".
+VERSION_MINOR := $(shell echo "$(VERSION)" | cut -d'.' -f2)
+
+# Given "v0.17.0-3.gb4eee9f.dirty" it returns "0-3.gb4eee9f.dirty".
+# Given "v0.17.1" it returns "1".
+VERSION_PATCH := $(shell echo "$(VERSION)" | cut -d'.' -f3-)
 
 release.tag:
 ifneq ($(VERSION_VALID),1)