sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2871 from NaturalGIS/processing_fix_grass7_detection_osx

Browse Source 
processing fix GRASS7 detection on osx: courtesy Martin Laloux
This commit is contained in:
volaya 2016-03-18 14:17:07 +01:00
commit 839db0a505
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/plugins/processing/algs/grass7/Grass7Utils.py
View File

@ -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() \