Skip to content

Commit ed8c02f

Browse files
committedOct 4, 2016
[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
1 parent 6d45b33 commit ed8c02f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎python/plugins/processing/algs/grass7/Grass7Utils.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ def prepareGrass7Execution(commands):
243243
Grass7Utils.createGrass7BatchJobFileFromGrass7Commands(commands)
244244
os.chmod(Grass7Utils.grassBatchJobFilename(), stat.S_IEXEC
245245
| stat.S_IREAD | stat.S_IWRITE)
246-
if isMac() and os.path.exists(Grass7Utils.grassPath() + os.sep + '*grass.sh*'):
247-
command = Grass7Utils.grassPath() + os.sep + '*grass.sh* ' \
246+
if isMac() and os.path.exists(Grass7Utils.grassPath() + os.sep + 'grass.sh'):
247+
command = Grass7Utils.grassPath() + os.sep + 'grass.sh ' \
248248
+ Grass7Utils.grassMapsetFolder() + '/PERMANENT'
249249
else:
250250
command = 'grass70 ' + Grass7Utils.grassMapsetFolder() \

0 commit comments

Comments
 (0)
Please sign in to comment.