From a690771253c9ac39031df8fe46bc46c3b867d123 Mon Sep 17 00:00:00 2001 From: Aaron Griffith Date: Sat, 17 Dec 2011 03:20:38 -0500 Subject: [PATCH] --version now displays the correct (new-form) version number --- overviewer.py | 11 ++++++----- overviewer_core/util.py | 15 +++++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/overviewer.py b/overviewer.py index d29359f..5a4c048 100755 --- a/overviewer.py +++ b/overviewer.py @@ -242,14 +242,15 @@ def main(): options.verbose > 0) if options.version: + print "Minecraft Overviewer %s" % util.findGitVersion(), + print "(%s)" % util.findGitHash()[:7] try: import overviewer_core.overviewer_version as overviewer_version - print "Minecraft-Overviewer %s" % overviewer_version.VERSION - print "Git commit: %s" % overviewer_version.HASH print "built on %s" % overviewer_version.BUILD_DATE - print "Build machine: %s %s" % (overviewer_version.BUILD_PLATFORM, overviewer_version.BUILD_OS) - except Exception: - print "version info not found" + if options.verbose > 0: + print "Build machine: %s %s" % (overviewer_version.BUILD_PLATFORM, overviewer_version.BUILD_OS) + except ImportError: + print "(build info not found)" pass doExit(code=0, consoleMsg=False) diff --git a/overviewer_core/util.py b/overviewer_core/util.py index e5fbfbf..6fce835 100644 --- a/overviewer_core/util.py +++ b/overviewer_core/util.py @@ -69,10 +69,17 @@ def findGitVersion(): line = line.split('-', 1)[1] if line.startswith('v'): line = line[1:] - # turn 0.1.2-50-somehash into 0.1.2-50 - # and 0.1.3 into 0.1.3 - line = '-'.join(line.split('-', 2)[:2]) - return line.strip() + # turn 0.1.0-50-somehash into 0.1.50 + # and 0.1.0 into 0.1.0 + line = line.strip().replace('-', '.').split('.') + if len(line) == 5: + del line[4] + del line[2] + else: + assert len(line) == 3 + line[2] = '0' + line = '.'.join(line) + return line except Exception: try: import overviewer_version