Merge branch 'master' of https://github.com/svenvh/gitstats

Signed-off-by: Heikki Hokkanen <hoxu@users.sf.net>

gitstats

@@ -92,14 +92,16 @@ VERSION = 0
 def getversion():
 	global VERSION
 	if VERSION == 0:
-		VERSION = getpipeoutput(["git rev-parse --short %s" % getcommitrange('HEAD')]).split('\n')[0]
+		gitstats_repo = os.path.dirname(os.path.abspath(__file__))
+		VERSION = getpipeoutput(["git --git-dir=%s/.git --work-tree=%s rev-parse --short %s" %
+			(gitstats_repo, gitstats_repo, getcommitrange('HEAD').split('\n')[0])])
 	return VERSION
 
 def getgitversion():
 	return getpipeoutput(['git --version']).split('\n')[0]
 
 def getgnuplotversion():
-	return getpipeoutput(['gnuplot --version']).split('\n')[0]
+	return getpipeoutput(['%s --version' % gnuplot_cmd]).split('\n')[0]
 
 class DataCollector:
 	"""Manages data collection from a revision control repository."""
@@ -1368,6 +1370,10 @@ Default config values:
 			print 'FATAL: Output path is not a directory or does not exist'
 			sys.exit(1)
 
+		if not getgnuplotversion():
+			print 'gnuplot not found'
+			sys.exit(1)
+
 		print 'Output path: %s' % outputpath
 		cachefile = os.path.join(outputpath, 'gitstats.cache')