processing fix GRASS7 detection on osx: courtesy Martin Laloux

qgis · Mar 6, 2016 · e1ff6e896a8178c2f61930535ca91a408c3e2355 · e1ff6e8
1 parent 2eb8243
commit e1ff6e896a8178c2f61930535ca91a408c3e2355
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 python/plugins/processing/algs/grass7/Grass7Utils.py
diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py
@@ -254,8 +254,8 @@ def prepareGrass7Execution(commands):
             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() \