[GRASS-SVN] r37332 - in grass/trunk/lib: gtcltk init

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-21 10:47:44 -0400 (Thu, 21 May 2009)
New Revision: 37332

Modified:
   grass/trunk/lib/gtcltk/gronsole.tcl
   grass/trunk/lib/init/grass-run.bat
Log:
sync RunInXterm related changes from devbr6

Modified: grass/trunk/lib/gtcltk/gronsole.tcl
===================================================================
--- grass/trunk/lib/gtcltk/gronsole.tcl	2009-05-21 14:44:40 UTC (rev 37331)
+++ grass/trunk/lib/gtcltk/gronsole.tcl	2009-05-21 14:47:44 UTC (rev 37332)
@@ -392,6 +392,8 @@
 
 proc Gronsole::readout {path ci mark fh} {
 
+#	global mingw
+
 	set lines {}
 	
 	while {[gets $fh line] >= 0} {
@@ -400,6 +402,10 @@
 	
 	if {[llength $lines] != 0} {
 		Gronsole::add_data_tag $path $ci out
+#		if { $mingw == "1" } {
+		    # FIXME bug #606
+#		    Gronsole::output_to_gronsole $path $mark $ci [list cmd$ci cmd$ci-out] "\n"
+#		}
 	}
 	foreach line $lines {
 		Gronsole::output_to_gronsole $path $mark $ci [list cmd$ci cmd$ci-out] "$line\n"
@@ -522,9 +528,12 @@
 	Gronsole::annotate $path $cmd [concat xterm $tags]
 
 	if { $mingw == "1" } {
-	    exec -- cmd.exe /c start $env(GISBASE)/etc/grass-run.bat $cmd &
+	    eval [list exec -- cmd.exe /c start \
+	    	$env(GISBASE)/etc/grass-run.bat ] $cmd &
 	} else {
-	    exec -- $env(GISBASE)/etc/grass-xterm-wrapper -name xterm-grass -e $env(GISBASE)/etc/grass-run.sh $cmd &
+	    eval [list exec -- $env(GISBASE)/etc/grass-xterm-wrapper \
+		-name xterm-grass -e $env(GISBASE)/etc/grass-run.sh ] \
+		$cmd &
 	}
 
 	update idletasks

Modified: grass/trunk/lib/init/grass-run.bat
===================================================================
--- grass/trunk/lib/init/grass-run.bat	2009-05-21 14:44:40 UTC (rev 37331)
+++ grass/trunk/lib/init/grass-run.bat	2009-05-21 14:47:44 UTC (rev 37332)
@@ -8,17 +8,21 @@
 set GRASS_UI_TERM=1
 
 rem Run command
-"%*"
+%*
 
+if not %errorlevel% == 0 goto error
+
 title GRASS: %1 Done.
-if %errorlevel% == 1 goto error
+echo.
+echo %1 complete.
+pause
 
-rem Pause for 2 seconds to allow user to read any output
-ping 127.0.0.1 -n 3 -w 1000 >NUL:
 :end
 exit %errorlevel%
 
 :error
+title GRASS: %1 Done. (error %errorlevel%)
+echo.
 echo -----
 echo ERROR: %1 exited abnormally.
 echo -----