Skip to content
Permalink
Browse files

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

follow up e1ff6e8

(cherry picked from commit d03d206)

Conflicts:
	python/plugins/processing/algs/grass7/Grass7Utils.py
  • Loading branch information
alexbruy committed Oct 4, 2016
1 parent a53dd3b commit d4082cf5409f8bdfb49de0592c4873783990f495
Showing with 2 additions and 2 deletions.
  1. +2 −2 python/plugins/processing/algs/grass7/Grass7Utils.py
@@ -243,8 +243,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 + '*grass.sh*'):
command = Grass7Utils.grassPath() + os.sep + '*grass.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() \

0 comments on commit d4082cf

Please sign in to comment.
You can’t perform that action at this time.