Skip to content
Permalink
Browse files

really fix ab5f06b (ouch again - machine mixup)

  • Loading branch information
jef-n committed Mar 31, 2016
1 parent c6117e0 commit 3bfe2f14673ef3f79645c1bdce78f2d2e2cdf6b8
@@ -90,7 +90,7 @@ def grassPath():
if folder is None:
if isWindows():
if "OSGEO4W_ROOT" in os.environ:
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps", "grass")
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps")
else:
testfolder = unicode(QgsApplication.prefixPath())
testfolder = os.path.join(testfolder, 'grass')
@@ -88,7 +88,7 @@ def grassPath():
if folder is None:
if isWindows():
if "OSGEO4W_ROOT" in os.environ:
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps", "grass")
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps")
else:
testfolder = unicode(QgsApplication.prefixPath())
testfolder = os.path.join(testfolder, 'grass')
@@ -102,7 +102,7 @@ def grassPath():
if not os.path.isdir(folder):
folder = '/Applications/GRASS-7.0.app/Contents/MacOS'

return folder
return folder or ''

@staticmethod
def grassWinShell():

0 comments on commit 3bfe2f1

Please sign in to comment.
You can’t perform that action at this time.