[GRASS-SVN] r56104 - grass/branches/releasebranch_6_4/lib/init

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-05-03 20:31:47 -0700 (Fri, 03 May 2013)
New Revision: 56104

Modified:
   grass/branches/releasebranch_6_4/lib/init/init.bat
Log:
script-within-script needs scripts/ in %PATH% (#1727, merge r56092 from devbr6)

Modified: grass/branches/releasebranch_6_4/lib/init/init.bat
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/init.bat	2013-05-03 21:14:13 UTC (rev 56103)
+++ grass/branches/releasebranch_6_4/lib/init/init.bat	2013-05-04 03:31:47 UTC (rev 56104)
@@ -24,8 +24,10 @@
 
 set SAVEPATH=%PATH%
 rem
-rem DON'T include the scripts/ directory in PATH -- The .bat files in the
-rem   bin/ directory are what execute the scripts on Windows.
+rem The .bat files in the \bin directory are what execute the scripts
+rem  on Windows. The \scripts dir is added to the PATH automatically by
+rem  the wxGUI; for Command Line mode and GIS.m, shell scripts called from
+rem  other shell scripts need to have %GISBASE%\scripts in the PATH.
 rem
 
 if exist "%APPDATA%\GRASS6\env.bat" (
@@ -121,9 +123,12 @@
 	set PYTHONPATH=%PYTHONPATH%;%GISBASE%\etc\python
 )
 
-if "%GRASS_GUI%"=="text" goto text
 if "%GRASS_GUI%"=="wxpython" goto wxpython
 
+PATH=%PATH%;%GISBASE%\scripts
+if "%GRASS_GUI%"=="text" goto text
+
+rem Tcl/Tk GUI setup
 if not "%GRASS_WISH%"=="" (
 	"%GRASS_WISH%" "%GISBASE%\etc\gis_set.tcl"
 ) else (