Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
really fix ab5f06b (ouch again - machine mixup)
  • Loading branch information
jef-n committed Mar 31, 2016
1 parent c6117e0 commit 3bfe2f1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/grass/GrassUtils.py
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/Grass7Utils.py
Expand Up @@ -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')
Expand All @@ -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():
Expand Down

0 comments on commit 3bfe2f1

Please sign in to comment.