[processing] correct GRASS 7 detection on Mac (fix #15645)

alexbruy · alexbruy · commit 683309a62b19 · 2016-10-04T19:41:04.000+03:00
follow up e1ff6e8 (cherry picked from commit d03d206) Conflicts: 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
@@ -246,8 +246,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() \
