osgeo4w: make batch files location independant

jef-n · jef-n · commit 44921e194a7c · 2013-04-25T21:06:29.000+02:00
diff --git a/ms-windows/osgeo4w/browser.bat.tmpl b/ms-windows/osgeo4w/browser.bat.tmpl
@@ -1,7 +1,5 @@
 @echo off
-
-SET OSGEO4W_ROOT=@osgeo4w@
-call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
+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
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -316,4 +316,3 @@ if exist %PACKAGENAME%-oracle-provider-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGEN
 
 :end
 echo FINISHED: %DATE% %TIME% >>%LOG% 2>&1
-
diff --git a/ms-windows/osgeo4w/qgis.bat.tmpl b/ms-windows/osgeo4w/qgis.bat.tmpl
@@ -1,7 +1,5 @@
 @echo off
-
-SET OSGEO4W_ROOT=@osgeo4w@
-call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
+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

Original file line number	Diff line number	Diff line change
`@@ -316,4 +316,3 @@ if exist %PACKAGENAME%-oracle-provider-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGEN`
`316`	`316`
`317`	`317`	`:end`
`318`	`318`	`echo FINISHED: %DATE% %TIME% >>%LOG% 2>&1`
`319`		`-`