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

[grass7][mac] Use the most recent GRASS version

Browse Source 
This is a continuation of:

- #8db3dead87e385f2798356d
- #5c97d22b16320874dbe1

This commit only affects users that have multiple GRASS installations on
their Macs. Using the most recent GRASS version is what we do on Linux too.
This commit is contained in:
Panos Mavrogiorgos 2019-02-19 08:59:29 +02:00 committed by Nyall Dawson
parent 50c9b2394e
commit c8d3f74f4a
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

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