From e1ff6e896a8178c2f61930535ca91a408c3e2355 Mon Sep 17 00:00:00 2001 From: Giovanni Manghi Date: Sun, 6 Mar 2016 10:32:06 +0000 Subject: [PATCH] processing fix GRASS7 detection on osx: courtesy Martin Laloux --- python/plugins/processing/algs/grass7/Grass7Utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py index 8bf8ad8eea0..af20a2aef74 100644 --- a/python/plugins/processing/algs/grass7/Grass7Utils.py +++ b/python/plugins/processing/algs/grass7/Grass7Utils.py @@ -254,8 +254,8 @@ class Grass7Utils: Grass7Utils.createGrass7BatchJobFileFromGrass7Commands(commands) os.chmod(Grass7Utils.grassBatchJobFilename(), stat.S_IEXEC | stat.S_IREAD | stat.S_IWRITE) - if isMac() and os.path.exists(Grass7Utils.grassPath() + os.sep + 'grass70.sh'): - command = Grass7Utils.grassPath() + os.sep + 'grass70.sh ' \ + if isMac() and os.path.exists(Grass7Utils.grassPath() + os.sep + '*grass.sh*'): + command = Grass7Utils.grassPath() + os.sep + '*grass.sh* ' \ + Grass7Utils.grassMapsetFolder() + '/PERMANENT' else: command = 'grass70 ' + Grass7Utils.grassMapsetFolder() \