From 04fbe177b9412de6fc01ef337540a7885656677e Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Fri, 25 Sep 2020 11:41:02 +0200 Subject: [PATCH] osgeo4w: don't pickup PATH changes by GRASS' env.bat (fixes #38476) --- ms-windows/osgeo4w/qgis-grass.bat.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ms-windows/osgeo4w/qgis-grass.bat.tmpl b/ms-windows/osgeo4w/qgis-grass.bat.tmpl index 7a7c4d3d0e5..4d45dca5a88 100644 --- a/ms-windows/osgeo4w/qgis-grass.bat.tmpl +++ b/ms-windows/osgeo4w/qgis-grass.bat.tmpl @@ -2,9 +2,10 @@ call "%~dp0\o4w_env.bat" call qt5_env.bat call py3_env.bat +set savedpath=%PATH% call "%OSGEO4W_ROOT%\apps\grass\@grasspath@\etc\env.bat" @echo off -path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\@grasspath@\lib;%OSGEO4W_ROOT%\apps\grass\@grasspath@\bin;%PATH% +path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\@grasspath@\lib;%OSGEO4W_ROOT%\apps\grass\@grasspath@\bin;%savedpath% 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