sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] detect GRASS 7.4 on Mac

Browse Source
This commit is contained in:
Alexander Bruy 2017-11-23 14:33:23 +02:00
parent a2ff3631d5
commit 6063c83edf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/plugins/processing/algs/grass7/Grass7Utils.py
View File

@ -216,7 +216,7 @@ class Grass7Utils(object):
elif isMac(): elif isMac():
# For MacOSX, we scan some well-known directories # For MacOSX, we scan some well-known directories
# Start with QGIS bundle # Start with QGIS bundle
for version in ['', '7', '70', '71', '72', '73']: for version in ['', '7', '70', '71', '72', '74']:
testfolder = os.path.join(str(QgsApplication.prefixPath()), testfolder = os.path.join(str(QgsApplication.prefixPath()),
'grass{}'.format(version)) 'grass{}'.format(version))
if os.path.isdir(testfolder): if os.path.isdir(testfolder):
@ -224,7 +224,7 @@ class Grass7Utils(object):
break break
# If nothing found, try standalone GRASS installation # If nothing found, try standalone GRASS installation
if folder is None: if folder is None:
for version in ['0', '1', '2', '3']: for version in ['0', '1', '2', '4']:
testfolder = '/Applications/GRASS-7.{}.app/Contents/MacOS'.format(version) testfolder = '/Applications/GRASS-7.{}.app/Contents/MacOS'.format(version)
if os.path.isdir(testfolder): if os.path.isdir(testfolder):
folder = testfolder folder = testfolder