Skip to content

Commit

Permalink
osgeo4w: fix quoting in batch files
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Feb 10, 2017
1 parent 565ad28 commit 801821f
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 16 deletions.
8 changes: 4 additions & 4 deletions ms-windows/osgeo4w/browser-grass.bat.tmpl
Original file line number Diff line number Diff line change
@@ -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" %*
6 changes: 3 additions & 3 deletions ms-windows/osgeo4w/browser.bat.tmpl
Original file line number Diff line number Diff line change
@@ -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" %*
3 changes: 2 additions & 1 deletion ms-windows/osgeo4w/designer.bat.tmpl
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ms-windows/osgeo4w/postinstall-common.bat
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion ms-windows/osgeo4w/postinstall-dev.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions ms-windows/osgeo4w/python.bat.tmpl
Original file line number Diff line number Diff line change
@@ -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@
Expand All @@ -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" %*
4 changes: 2 additions & 2 deletions ms-windows/osgeo4w/qgis-grass.bat.tmpl
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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" %*
2 changes: 1 addition & 1 deletion ms-windows/osgeo4w/qgis.bat.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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" %*

0 comments on commit 801821f

Please sign in to comment.