Skip to content

Commit

Permalink
[processing] correct GRASS 7 detection on Mac (fix #15645)
Browse files Browse the repository at this point in the history
follow up e1ff6e8
  • Loading branch information
alexbruy committed Oct 4, 2016
1 parent 0b68363 commit d03d206
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/Grass7Utils.py
Expand Up @@ -244,8 +244,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(os.path.join(Grass7Utils.grassPath(), '*grass.sh*')):
command = os.path.join(Grass7Utils.grassPath(), '*grass.sh*') + ' ' \
if isMac() and os.path.exists(os.path.join(Grass7Utils.grassPath(), 'grass.sh')):
command = os.path.join(Grass7Utils.grassPath(), 'grass.sh') + ' ' \
+ os.path.join(Grass7Utils.grassMapsetFolder(), 'PERMANENT')
else:
command = 'grass70 ' + os.path.join(Grass7Utils.grassMapsetFolder(), 'PERMANENT')
Expand Down

0 comments on commit d03d206

Please sign in to comment.