[processing] Support grass version 7.8

qgis · Nov 12, 2019 · e61d985 · e61d985
1 parent c48ee4d
commit e61d985
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py
@@ -161,8 +161,8 @@ def searchFolder(folder):
                 ]
         else:
             cmdList = [
-                "grass76", "grass74", "grass72", "grass70", "grass",
-                "grass76.sh", "grass74.sh", "grass72.sh", "grass70.sh", "grass.sh"
+                "grass78", "grass76", "grass74", "grass72", "grass70", "grass",
+                "grass78.sh", "grass76.sh", "grass74.sh", "grass72.sh", "grass70.sh", "grass.sh"
             ]
 
         # For MS-Windows there is a difference between GRASS Path and GRASS binary
@@ -226,15 +226,15 @@ def grassPath():
             elif isMac():
                 # For MacOSX, we scan some well-known directories
                 # Start with QGIS bundle
-                for version in ['', '7', '76', '74', '72', '71', '70']:
+                for version in ['', '7', '78', '76', '74', '72', '71', '70']:
                     testfolder = os.path.join(str(QgsApplication.prefixPath()),
                                               'grass{}'.format(version))
                     if os.path.isdir(testfolder):
                         folder = testfolder
                         break
                     # If nothing found, try standalone GRASS installation
                     if folder is None:
-                        for version in ['6', '4', '2', '1', '0']:
+                        for version in ['8', '6', '4', '2', '1', '0']:
                             testfolder = '/Applications/GRASS-7.{}.app/Contents/MacOS'.format(version)
                             if os.path.isdir(testfolder):
                                 folder = testfolder
@@ -561,7 +561,7 @@ def grassHelpPath():
             return 'https://grass.osgeo.org/grass{}/manuals/'.format(version)
         else:
             # GRASS not available!
-            return 'https://grass.osgeo.org/grass76/manuals/'
+            return 'https://grass.osgeo.org/grass78/manuals/'
 
     @staticmethod
     def getSupportedOutputRasterExtensions():