diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2017-01-09 23:33:23 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2017-01-09 23:33:23 -0500 |
| commit | eebaeeff96450c840db1a86f08877420d3dd5073 (patch) | |
| tree | 122355b6d19bade4c64128f2d347aa63ea0e6385 /klippy | |
| parent | 3a7a77d49e620420ee33996eec0a70a7c186f6bb (diff) | |
| download | kutter-eebaeeff96450c840db1a86f08877420d3dd5073.tar.gz kutter-eebaeeff96450c840db1a86f08877420d3dd5073.tar.xz kutter-eebaeeff96450c840db1a86f08877420d3dd5073.zip | |
util: Use path of script instead of current directory for git version
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy')
| -rw-r--r-- | klippy/util.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/klippy/util.py b/klippy/util.py index 7a61de08..7afb3d1c 100644 --- a/klippy/util.py +++ b/klippy/util.py @@ -3,7 +3,8 @@ # Copyright (C) 2016 Kevin O'Connor <kevin@koconnor.net> # # This file may be distributed under the terms of the GNU GPLv3 license. -import os, pty, fcntl, termios, signal, logging, subprocess, traceback, shlex +import sys, os, pty, fcntl, termios, signal, logging +import subprocess, traceback, shlex # Return the SIGINT interrupt handler back to the OS default def fix_sigint(): @@ -38,10 +39,11 @@ def create_pty(ptyname): def get_git_version(): # Obtain version info from "git" program - if not os.path.exists('.git'): + gitdir = os.path.join(sys.path[0], '..', '.git') + if not os.path.exists(gitdir): logging.debug("No '.git' file/directory found") return "?" - prog = "git describe --tags --long --dirty" + prog = "git --git-dir=%s describe --tags --long --dirty" % (gitdir,) try: process = subprocess.Popen(shlex.split(prog), stdout=subprocess.PIPE) output = process.communicate()[0] |