GitHub CI: update list of container images

[tinc] / version.py

diff --git a/version.py b/version.py
index b4fb38a..5617cae 100755 (executable)
--- a/version.py
+++ b/version.py
@@ -1,42 +1,24 @@
 #!/usr/bin/env python3
 
+"""Print current tinc version for using in build scripts."""
+
 from os import path, environ
-from sys import argv, stderr
 import subprocess as subp
 
-prefix = "release-"
-source_root = path.dirname(path.realpath(__file__))
-source_root = environ.get("MESON_SOURCE_ROOT", source_root)
+PREFIX = "release-"
+SOURCE_ROOT = path.dirname(path.realpath(__file__))
+SOURCE_ROOT = environ.get("MESON_SOURCE_ROOT", SOURCE_ROOT)
 
 cmd = [
     "git",
     "--git-dir",
-    path.join(source_root, ".git"),
+    path.join(SOURCE_ROOT, ".git"),
     "describe",
     "--always",
     "--tags",
-    "--match=" + prefix + "*",
+    "--match=" + PREFIX + "*",
 ]
 
-if "short" in argv:
-    cmd.append("--abbrev=0")
-
-version = None
-
-try:
-    result = subp.run(cmd, stdout=subp.PIPE, encoding="utf-8")
-    if not result.returncode:
-        version = result.stdout
-except FileNotFoundError:
-    pass
-
-if not version:
-    try:
-        with open(path.join(source_root, "VERSION"), "r") as f:
-            version = f.read().strip()
-    except OSError as e:
-        print("could not read version from file", e, file=stderr)
-elif version.startswith(prefix):
-    version = version[len(prefix):].strip()
-
-print(version if version else "unknown", end="")
+result = subp.run(cmd, stdout=subp.PIPE, encoding="utf-8", check=True)
+version = result.stdout.strip().replace("release-", "", 1)
+print(version)