[GRASS-SVN] r74035 - grass/branches/releasebranch_7_4/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2019-01-28 01:44:15 -0800 (Mon, 28 Jan 2019)
New Revision: 74035

Modified:
   grass/branches/releasebranch_7_4/mswindows/osgeo4w/grass.bat.tmpl
Log:
wrong OSGEO4W_ROOT when installing OSGeo4W to different target directory, see #3724 (g74: merge r74020 from trunk)

Modified: grass/branches/releasebranch_7_4/mswindows/osgeo4w/grass.bat.tmpl
===================================================================
--- grass/branches/releasebranch_7_4/mswindows/osgeo4w/grass.bat.tmpl	2019-01-28 09:38:37 UTC (rev 74034)
+++ grass/branches/releasebranch_7_4/mswindows/osgeo4w/grass.bat.tmpl	2019-01-28 09:44:15 UTC (rev 74035)
@@ -5,13 +5,12 @@
 rem #
 rem #########################################################################
 
-SET OSGEO4W_ROOT=@osgeo4w@
-
 rem
 rem Set environmental variables
 rem
-call %OSGEO4W_ROOT%\bin\o4w_env.bat
-call %OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\env.bat
+call "%~dp0\o4w_env.bat"
+call "%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\env.bat"
+ at echo off
 
 rem
 rem Launch GRASS GIS