Direct access to grass70, in lieu of grass.sh, for Processing on Mac

- This just gets GRASS 7 useable in Processing. Vetting of all env vars has not been done. - Note: all GRASS scripts are now Python, so grass.sh is not available anyway. - Test for grass.sh remains, in case it is created for a custom packaging setup.
qgis · Apr 18, 2014 · b928d16 · b928d16
1 parent cbee1b5
commit b928d16
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/python/plugins/processing/grass7/Grass7Utils.py b/python/plugins/processing/grass7/Grass7Utils.py
@@ -254,7 +254,7 @@ def prepareGrass7Execution(commands):
             Grass7Utils.createGrass7BatchJobFileFromGrass7Commands(commands)
             os.chmod(Grass7Utils.grassBatchJobFilename(), stat.S_IEXEC
                      | stat.S_IREAD | stat.S_IWRITE)
-            if isMac():
+            if isMac() and os.path.exists(Grass7Utils.grassPath() + os.sep + 'grass70.sh'):
                 command = Grass7Utils.grassPath() + os.sep + 'grass70.sh ' \
                     + Grass7Utils.grassMapsetFolder() + '/PERMANENT'
             else: