X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=version.py;h=5617cae6ae84a0aca5d807d46871947d26c83bc9;hb=refs%2Fheads%2F1.1;hp=ff491bb5dae7f7909a4e0182d34d2150ba2129de;hpb=33f0918cde36accb606271c379bc8e75973e9d59;p=tinc

diff --git a/version.py b/version.py
index ff491bb5..5617cae6 100755
--- a/version.py
+++ b/version.py
@@ -1,26 +1,24 @@
 #!/usr/bin/env python3
 
-from sys import argv, exit
+"""Print current tinc version for using in build scripts."""
+
+from os import path, environ
 import subprocess as subp
 
-prefix = "release-"
+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"),
     "describe",
     "--always",
     "--tags",
-    "--match=" + prefix + "*",
+    "--match=" + PREFIX + "*",
 ]
 
-if "short" in argv:
-    cmd.append("--abbrev=0")
-
-result = subp.run(cmd, stdout=subp.PIPE, encoding="utf-8")
-version = result.stdout
-
-if not result.returncode and version and version.startswith(prefix):
-    version = version[len(prefix):].strip()
-
-print(version if version else "unknown", end="")
-exit(not version)
+result = subp.run(cmd, stdout=subp.PIPE, encoding="utf-8", check=True)
+version = result.stdout.strip().replace("release-", "", 1)
+print(version)