Merge pull request #2871 from NaturalGIS/processing_fix_grass7_detect…

…ion_osx processing fix GRASS7 detection on osx: courtesy Martin Laloux
qgis · Mar 18, 2016 · 839db0a · 839db0a
2 parents 1fdd177 + e1ff6e8
commit 839db0a
Showing 1 changed file with 2 additions and 2 deletions.
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() \