Fix marking build version segments when there's a pre-release segment

Author: MatthewWilkes

components/st3m/host-tools/version.py

@@ -11,6 +11,7 @@
 import subprocess
 import sys
 import os
+import re
 
 
 def get_git_based_version():
@@ -19,9 +20,14 @@ def get_git_based_version():
     version = subprocess.check_output(
         ["git", "describe", "--tags", "--always"]
     ).decode().strip()
-    if '-' in version:
-        version = version.replace("-", "+", 1)
-        version  = version.replace("-", ".")
+    commit_hash = subprocess.check_output(
+        ["git", "describe", "--always"]
+    ).decode().strip()
+    if version.endswith(commit_hash):
+        build_info = re.compile(f"\-(\d+)\-(.*?{re.escape(commit_hash)})").findall(version)
+        if build_info:
+            ahead, commit_hash = build_info[0]
+            version = version.replace(f"-{ahead}-{commit_hash}", f"+{ahead}.{commit_hash}", 1)
     return version
 
 fmt = None