LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch 'dtt-c-render' into py-package

Browse Source 
Conflicts:
	overviewer.py
This commit is contained in:
Aaron Griffith
2011-04-01 21:59:52 -04:00
parent 42596416d9 3d78e21af7
commit 115c36ad5e
8 changed files with 539 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
overviewer_core/util.py
View File

@@ -36,11 +36,14 @@ def get_program_path():
def findGitVersion():
if os.path.exists(".git"):
with open(os.path.join(".git","HEAD")) as f:
this_dir = get_program_path()
if os.path.exists(os.path.join(this_dir,".git")):
with open(os.path.join(this_dir,".git","HEAD")) as f:
data = f.read().strip()
if data.startswith("ref: "):
with open(os.path.join(".git", data[5:])) as g:
if not os.path.exists(os.path.join(this_dir,data[5:])):
return data
with open(os.path.join(this_dir, ".git", data[5:])) as g:
return g.read().strip()
else:
return data