Skip to content

Commit

Permalink
processing fix GRASS7 detection on osx: courtesy Martin Laloux
Browse files Browse the repository at this point in the history
  • Loading branch information
Giovanni Manghi committed Mar 6, 2016
1 parent 2eb8243 commit e1ff6e8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/Grass7Utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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() \
Expand Down

0 comments on commit e1ff6e8

Please sign in to comment.