From 6063c83edfeb705d22730bd55558c46ffe3bc925 Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Thu, 23 Nov 2017 14:33:23 +0200 Subject: [PATCH] [processing] detect GRASS 7.4 on Mac --- python/plugins/processing/algs/grass7/Grass7Utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py index 2b4bd0ac314..32d2caf3bd2 100644 --- a/python/plugins/processing/algs/grass7/Grass7Utils.py +++ b/python/plugins/processing/algs/grass7/Grass7Utils.py @@ -216,7 +216,7 @@ class Grass7Utils(object): elif isMac(): # For MacOSX, we scan some well-known directories # 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()), 'grass{}'.format(version)) if os.path.isdir(testfolder): @@ -224,7 +224,7 @@ class Grass7Utils(object): break # If nothing found, try standalone GRASS installation 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) if os.path.isdir(testfolder): folder = testfolder