Showing with 3 additions and 3 deletions.
  1. +1 −1 ms-windows/osgeo4w/browser.bat.tmpl
  2. +1 −1 ms-windows/osgeo4w/qgis.bat.tmpl
  3. +1 −1 python/plugins/processing/grass/GrassUtils.py
2 changes: 1 addition & 1 deletion ms-windows/osgeo4w/browser.bat.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
call "%~dp0\o4w_env.bat"
call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
@echo off
path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%PATH%
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
start "QGIS Browser" /B "%OSGEO4W_ROOT%"\bin\@package@-browser-bin.exe %*
2 changes: 1 addition & 1 deletion ms-windows/osgeo4w/qgis.bat.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
call "%~dp0\o4w_env.bat"
call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
@echo off
path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%PATH%
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
set GDAL_FILENAME_IS_UTF8=YES
rem Set VSI cache to be used as buffer, see #6448
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/grass/GrassUtils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ def checkGrassIsInstalled(ignorePreviousState=False):
path = GrassUtils.grassPath()
if path == '':
return 'GRASS folder is not configured.\nPlease configure \
it before running SAGA algorithms.'
it before running GRASS algorithms.'
cmdpath = os.path.join(path, 'bin', 'r.out.gdal.exe')
if not os.path.exists(cmdpath):
return 'The specified GRASS folder does not contain a valid \
Expand Down