[GRASS-SVN] r56780 - in grass/branches/releasebranch_6_4: lib/init mswindows

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-06-18 03:49:38 -0700 (Tue, 18 Jun 2013)
New Revision: 56780

Modified:
   grass/branches/releasebranch_6_4/lib/init/init.bat
   grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl
   grass/branches/releasebranch_6_4/mswindows/env.bat
Log:
use more as the default pager on wingrass (#945, merge from devbr6)

Modified: grass/branches/releasebranch_6_4/lib/init/init.bat
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/init.bat	2013-06-18 10:10:01 UTC (rev 56779)
+++ grass/branches/releasebranch_6_4/lib/init/init.bat	2013-06-18 10:49:38 UTC (rev 56780)
@@ -7,14 +7,14 @@
 rem  PURPOSE:  	The source file for this batch script is lib/init/init.bat.
 rem             It sets up some environment variables, default GISRC file
 rem             if necessary, etc. prior to starting GRASS proper.
-rem             It is intended to be a native Windows replacement for Init.bat,
+rem             It is intended to be a native Windows replacement for Init.sh,
 rem             but does not (yet) contain all the same functionality.
 rem
 rem             In particular also, GUI mode prints nothing to the terminal
 rem             and does not expect or provide an interactive terminal
 rem             running in addition to the GUI display.
 rem 
-rem  COPYRIGHT: (C) 2006, 2011 by the GRASS Development Team
+rem  COPYRIGHT: (C) 2006-2013 by the GRASS Development Team
 rem
 rem             This program is free software under the GNU General Public
 rem   	    	License (>=v2). Read the file COPYING that comes with GRASS
@@ -55,7 +55,6 @@
 FOR /F "usebackq delims==" %%i IN (`"%GISBASE%\etc\winlocale"`) DO @set LANG=%%i
 :langset
 
-set GRASS_PAGER=more
 if "%GRASS_WISH%"=="" set GRASS_WISH=wish.exe
 if "%GRASS_SH%"=="" set GRASS_SH=c:\msys\1.0\bin\sh.exe
 

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl	2013-06-18 10:10:01 UTC (rev 56779)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl	2013-06-18 10:49:38 UTC (rev 56780)
@@ -759,7 +759,7 @@
 	FileWrite $0 '#   	    	requires a source file because the definition of GISBASE$\r$\n'
 	FileWrite $0 '#   	    	is not known until compile time and is substituted from the$\r$\n'
 	FileWrite $0 '#   	    	Makefile. Any command line options are passed to Init.sh.$\r$\n'
-	FileWrite $0 '# COPYRIGHT:  	(C) 2000-2010 by the GRASS Development Team$\r$\n'
+	FileWrite $0 '# COPYRIGHT:  	(C) 2000-2013 by the GRASS Development Team$\r$\n'
 	FileWrite $0 '#$\r$\n'
 	FileWrite $0 '#             	This program is free software under the GNU General Public$\r$\n'
 	FileWrite $0 '#   	    	License (>=v2). Read the file COPYING that comes with GRASS$\r$\n'
@@ -785,6 +785,10 @@
 	FileWrite $0 'PATH="$$GISBASE/extrabin:$$GISBASE/extralib:$$PATH"$\r$\n'
 	FileWrite $0 'PATH="$$GISBASE/tcl-tk/bin:$$GISBASE/sqlite/bin:$$PATH"$\r$\n'
 	FileWrite $0 'export PATH$\r$\n'
+	FileWrite $0 '$\r$\n'
+	FileWrite $0 'GRASS_PAGER=more$\r$\n'
+	FileWrite $0 'export GRASS_PAGER$\r$\n'
+	FileWrite $0 '$\r$\n'
 	FileWrite $0 '# Set the PYTHONPATH variable$\r$\n'
 	FileWrite $0 'PYTHONPATH="$$GISBASE/etc/python:$$GISBASE/Python27:$$PYTHONPATH"$\r$\n'
 	FileWrite $0 'export PYTHONPATH$\r$\n'
@@ -795,7 +799,7 @@
 	FileWrite $0 '   export GRASS_PYTHON$\r$\n'
 	FileWrite $0 'fi$\r$\n'
 	FileWrite $0 '$\r$\n'
-	FileWrite $0 '# Set to default web browser$\r$\n'
+	FileWrite $0 '# Set the default web browser$\r$\n'
 	FileWrite $0 'GRASS_HTML_BROWSER=explorer$\r$\n'
 	FileWrite $0 'export GRASS_HTML_BROWSER$\r$\n'
 	FileWrite $0 '$\r$\n'

Modified: grass/branches/releasebranch_6_4/mswindows/env.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/env.bat	2013-06-18 10:10:01 UTC (rev 56779)
+++ grass/branches/releasebranch_6_4/mswindows/env.bat	2013-06-18 10:49:38 UTC (rev 56780)
@@ -5,6 +5,7 @@
 set GRASS_PROJSHARE=%GISBASE%\proj
 set GRASS_HTML_BROWSER=explorer
 set GRASS_SH=%GISBASE%\msys\bin\sh.exe
+set GRASS_PAGER=more
 
 set PYTHONHOME=%GISBASE%\Python27
 set GDAL_DATA=%GISBASE%\share\gdal