Skip to content

Commit d03d206

Browse files
committedOct 4, 2016
[processing] correct GRASS 7 detection on Mac (fix #15645)
follow up e1ff6e8
1 parent 0b68363 commit d03d206

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
@@ -244,8 +244,8 @@ def prepareGrass7Execution(commands):
244244
Grass7Utils.createGrass7BatchJobFileFromGrass7Commands(commands)
245245
os.chmod(Grass7Utils.grassBatchJobFilename(), stat.S_IEXEC
246246
| stat.S_IREAD | stat.S_IWRITE)
247-
if isMac() and os.path.exists(os.path.join(Grass7Utils.grassPath(), '*grass.sh*')):
248-
command = os.path.join(Grass7Utils.grassPath(), '*grass.sh*') + ' ' \
247+
if isMac() and os.path.exists(os.path.join(Grass7Utils.grassPath(), 'grass.sh')):
248+
command = os.path.join(Grass7Utils.grassPath(), 'grass.sh') + ' ' \
249249
+ os.path.join(Grass7Utils.grassMapsetFolder(), 'PERMANENT')
250250
else:
251251
command = 'grass70 ' + os.path.join(Grass7Utils.grassMapsetFolder(), 'PERMANENT')

0 commit comments

Comments
 (0)
Please sign in to comment.