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

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-11-25 09:39:45 -0800 (Wed, 25 Nov 2015)
New Revision: 66922

Modified:
   grass/trunk/mswindows/osgeo4w/postinstall.bat
   grass/trunk/mswindows/osgeo4w/preremove.bat
Log:
 winGRASS: remove ununsed shell startup script (cont'ed)

Modified: grass/trunk/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/trunk/mswindows/osgeo4w/postinstall.bat	2015-11-25 17:31:34 UTC (rev 66921)
+++ grass/trunk/mswindows/osgeo4w/postinstall.bat	2015-11-25 17:39:45 UTC (rev 66922)
@@ -1,8 +1,7 @@
 set ICON=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\gui\icons\grass_osgeo.ico
 set ICON_CMD=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\gui\icons\grass_cmd.ico
 set BATCH=%OSGEO4W_ROOT%\bin\@GRASS_EXECUTABLE at .bat
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .bat
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@
+textreplace -std -t "%BATCH%"
 textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
 
 mkdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@" 
@@ -30,4 +29,3 @@
 "%GISBASE%\bin\g.mkfontcap.exe" -o
 
 del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .bat.tmpl
-del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .tmpl

Modified: grass/trunk/mswindows/osgeo4w/preremove.bat
===================================================================
--- grass/trunk/mswindows/osgeo4w/preremove.bat	2015-11-25 17:31:34 UTC (rev 66921)
+++ grass/trunk/mswindows/osgeo4w/preremove.bat	2015-11-25 17:39:45 UTC (rev 66922)
@@ -5,7 +5,6 @@
 del "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk"
 
 del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .bat
-del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@
 del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
 del "%OSGEO4W_ROOT%"\apps\msys\bin\libintl3.dll
 del "%OSGEO4W_ROOT%"\apps\msys\bin\libiconv2.dll