From 7a8dae5e3584d271b430d4764aa2d883af9fc74a Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 3 Dec 2012 23:44:35 -0500 Subject: [PATCH] Try and make branch non-derpy --- getversion.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/getversion.py b/getversion.py index 1dd90d8838..e15ca64fe5 100644 --- a/getversion.py +++ b/getversion.py @@ -48,9 +48,17 @@ def main(): (mcpversion,mcclientversion,mcserverversion) = re.match("[.\w]+ \(data: ([.\w]+), client: ([.\w.]+), server: ([.\w.]+)\)",Commands.fullversion()).groups() if os.getenv("GIT_BRANCH") is None: - branch="master" + cmd = "git rev-parse --abbrev-ref HEAD" + try: + process = subprocess.Popen(cmdsplit(cmd), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, bufsize=-1) + branch, _ = process.communicate() + except OSError: + print("Git not found") + branch="master" else: branch=os.getenv("GIT_BRANCH").rpartition('/')[2] + if branch == 'HEAD': + branch = "master" with open("fmlversion.properties","w") as f: f.write("%s=%s\n" %("fmlbuild.major.number",major))