From 801821f6f1ce1d5ccfd1b5d0a8b61b0ab2f6e9ba Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Fri, 10 Feb 2017 20:21:10 +0100 Subject: [PATCH] osgeo4w: fix quoting in batch files --- ms-windows/osgeo4w/browser-grass.bat.tmpl | 8 ++++---- ms-windows/osgeo4w/browser.bat.tmpl | 6 +++--- ms-windows/osgeo4w/designer.bat.tmpl | 3 ++- ms-windows/osgeo4w/postinstall-common.bat | 2 +- ms-windows/osgeo4w/postinstall-dev.bat | 2 +- ms-windows/osgeo4w/python.bat.tmpl | 6 +++--- ms-windows/osgeo4w/qgis-grass.bat.tmpl | 4 ++-- ms-windows/osgeo4w/qgis.bat.tmpl | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ms-windows/osgeo4w/browser-grass.bat.tmpl b/ms-windows/osgeo4w/browser-grass.bat.tmpl index 58328ed4f59..49bd7314166 100644 --- a/ms-windows/osgeo4w/browser-grass.bat.tmpl +++ b/ms-windows/osgeo4w/browser-grass.bat.tmpl @@ -1,10 +1,10 @@ @echo off call "%~dp0\o4w_env.bat" -call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat -call "%~dp0\qt5_env.bat" -call "%~dp0\py3_env.bat" +call "%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\etc\env.bat" +call qt5_env.bat +call py3_env.bat @echo off path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\bin;%PATH% set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@ set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins -start "QGIS Browser" /B "%OSGEO4W_ROOT%"\bin\@package@-browser-bin.exe %* +start "QGIS Browser" /B "%OSGEO4W_ROOT%\bin\@package@-browser-bin.exe" %* diff --git a/ms-windows/osgeo4w/browser.bat.tmpl b/ms-windows/osgeo4w/browser.bat.tmpl index 76ff1621acc..f7bcb62425f 100644 --- a/ms-windows/osgeo4w/browser.bat.tmpl +++ b/ms-windows/osgeo4w/browser.bat.tmpl @@ -1,9 +1,9 @@ @echo off call "%~dp0\o4w_env.bat" -call "%~dp0\qt5_env.bat" -call "%~dp0\py3_env.bat" +call qt5_env.bat +call py3_env.bat @echo off path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH% set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@ set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins -start "QGIS Browser" /B "%OSGEO4W_ROOT%"\bin\@package@-browser-bin.exe %* +start "QGIS Browser" /B "%OSGEO4W_ROOT%\bin\@package@-browser-bin.exe" %* diff --git a/ms-windows/osgeo4w/designer.bat.tmpl b/ms-windows/osgeo4w/designer.bat.tmpl index 9e8ea855401..ea5b3fde056 100644 --- a/ms-windows/osgeo4w/designer.bat.tmpl +++ b/ms-windows/osgeo4w/designer.bat.tmpl @@ -1,6 +1,7 @@ @echo off call "%~dp0\o4w_env.bat" -call "%~dp0\qt5_env.bat" +call qt5_env.bat +call py3_env.bat path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH% set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@ set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins diff --git a/ms-windows/osgeo4w/postinstall-common.bat b/ms-windows/osgeo4w/postinstall-common.bat index d41a3310be3..4cbee4a1bf3 100644 --- a/ms-windows/osgeo4w/postinstall-common.bat +++ b/ms-windows/osgeo4w/postinstall-common.bat @@ -1,5 +1,5 @@ call "%OSGEO4W_ROOT%\bin\o4w_env.bat" -call "%OSGEO4W_ROOT%\bin\qt5_env.bat" +call qt5_env.bat path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@ "%OSGEO4W_ROOT%\apps\@package@\crssync" diff --git a/ms-windows/osgeo4w/postinstall-dev.bat b/ms-windows/osgeo4w/postinstall-dev.bat index a8338f09056..eb451188929 100644 --- a/ms-windows/osgeo4w/postinstall-dev.bat +++ b/ms-windows/osgeo4w/postinstall-dev.bat @@ -29,7 +29,7 @@ REM Do not register extensions if release is installed if not exist "%O4W_ROOT%\apps\qgis\bin\qgis.reg" nircmd elevate "%WINDIR%\regedit" /s "%O4W_ROOT%\apps\@package@\bin\qgis.reg" call "%OSGEO4W_ROOT%\bin\o4w_env.bat" -call "%OSGEO4W_ROOT%\bin\qt5_env.bat" +call qt5_env.bat path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@ "%OSGEO4W_ROOT%\apps\@package@\crssync" diff --git a/ms-windows/osgeo4w/python.bat.tmpl b/ms-windows/osgeo4w/python.bat.tmpl index 0973f981d59..3282dcd50e5 100644 --- a/ms-windows/osgeo4w/python.bat.tmpl +++ b/ms-windows/osgeo4w/python.bat.tmpl @@ -1,7 +1,7 @@ @echo off call "%~dp0\o4w_env.bat" -call "%~dp0\qt5_env.bat" -call "%~dp0\py3_env.bat" +call qt5_env.bat +call py3_env.bat @echo off path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH% set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@ @@ -11,4 +11,4 @@ set VSI_CACHE=TRUE set VSI_CACHE_SIZE=1000000 set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins set PYTHONPATH=%OSGEO4W_ROOT%\apps\@package@\python;%PYTHONPATH% -"%OSGEO4W_ROOT%"\bin\python.exe %* +"%PYTHONHOME%\python" %* diff --git a/ms-windows/osgeo4w/qgis-grass.bat.tmpl b/ms-windows/osgeo4w/qgis-grass.bat.tmpl index 237c6d193f6..cced8a3419e 100644 --- a/ms-windows/osgeo4w/qgis-grass.bat.tmpl +++ b/ms-windows/osgeo4w/qgis-grass.bat.tmpl @@ -1,6 +1,6 @@ @echo off call "%~dp0\o4w_env.bat" -call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat +call "%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\etc\env.bat" call qt5_env.bat call py3_env.bat @echo off @@ -11,4 +11,4 @@ rem Set VSI cache to be used as buffer, see #6448 set VSI_CACHE=TRUE set VSI_CACHE_SIZE=1000000 set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins -start "QGIS" /B "%OSGEO4W_ROOT%"\bin\@package@-bin.exe %* +start "QGIS" /B "%OSGEO4W_ROOT%\bin\@package@-bin.exe" %* diff --git a/ms-windows/osgeo4w/qgis.bat.tmpl b/ms-windows/osgeo4w/qgis.bat.tmpl index b86937dc76d..e3c09c80e4b 100644 --- a/ms-windows/osgeo4w/qgis.bat.tmpl +++ b/ms-windows/osgeo4w/qgis.bat.tmpl @@ -10,4 +10,4 @@ rem Set VSI cache to be used as buffer, see #6448 set VSI_CACHE=TRUE set VSI_CACHE_SIZE=1000000 set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins -start "QGIS" /B "%OSGEO4W_ROOT%"\bin\@package@-bin.exe %* +start "QGIS" /B "%OSGEO4W_ROOT%\bin\@package@-bin.exe" %*