[GRASS-SVN] r72996 - grass/trunk/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: hcho
Date: 2018-07-18 20:07:40 -0700 (Wed, 18 Jul 2018)
New Revision: 72996

Modified:
   grass/trunk/mswindows/osgeo4w/grass.bat.tmpl
   grass/trunk/mswindows/osgeo4w/package.sh
Log:
wingrass: Fix OSGEO4W_ROOT in grass.bat

Modified: grass/trunk/mswindows/osgeo4w/grass.bat.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/grass.bat.tmpl	2018-07-18 23:45:49 UTC (rev 72995)
+++ grass/trunk/mswindows/osgeo4w/grass.bat.tmpl	2018-07-19 03:07:40 UTC (rev 72996)
@@ -5,7 +5,7 @@
 rem #
 rem #########################################################################
 
-SET OSGEO4W_ROOT=@osgeo4w@
+SET OSGEO4W_ROOT=@OSGEO4W_ROOT@
 
 rem
 rem Set environmental variables

Modified: grass/trunk/mswindows/osgeo4w/package.sh
===================================================================
--- grass/trunk/mswindows/osgeo4w/package.sh	2018-07-18 23:45:49 UTC (rev 72995)
+++ grass/trunk/mswindows/osgeo4w/package.sh	2018-07-19 03:07:40 UTC (rev 72996)
@@ -236,7 +236,8 @@
     cd $OSGEO4W_ROOT_MSYS 
 
     # update startup script
-    sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
+    sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT@#$OSGEO4W_ROOT#g" \
+	-e "s#@POSTFIX@#$MAJOR$MINOR#g" \
 	$SRC/mswindows/osgeo4w/grass.bat.tmpl > bin/${GRASS_EXECUTABLE}.bat.tmpl
     
     # bat files - unix2dos