[GRASS-SVN] r37289 - in grass/branches/develbranch_6/lib: gtcltk init

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-19 13:01:45 -0400 (Tue, 19 May 2009)
New Revision: 37289

Modified:
   grass/branches/develbranch_6/lib/gtcltk/gronsole.tcl
   grass/branches/develbranch_6/lib/init/grass-run.src
Log:
hack away on bugs #604 and #606

Modified: grass/branches/develbranch_6/lib/gtcltk/gronsole.tcl
===================================================================
--- grass/branches/develbranch_6/lib/gtcltk/gronsole.tcl	2009-05-19 14:42:51 UTC (rev 37288)
+++ grass/branches/develbranch_6/lib/gtcltk/gronsole.tcl	2009-05-19 17:01:45 UTC (rev 37289)
@@ -395,6 +395,8 @@
 
 proc Gronsole::readout {path ci mark fh} {
 
+#	global mingw
+
 	set lines {}
 
 	while {[gets $fh line] >= 0} {
@@ -406,6 +408,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"
+#		}
 	}
 
 	#output any messages from running the command
@@ -535,7 +541,9 @@
 	if { $mingw == "1" } {
 	    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 \
+		[lindex $cmd 0] [split [lrange $cmd 1 end]] ] &
 	}
 
 	update idletasks

Modified: grass/branches/develbranch_6/lib/init/grass-run.src
===================================================================
--- grass/branches/develbranch_6/lib/init/grass-run.src	2009-05-19 14:42:51 UTC (rev 37288)
+++ grass/branches/develbranch_6/lib/init/grass-run.src	2009-05-19 17:01:45 UTC (rev 37289)
@@ -1,6 +1,9 @@
 #!/bin/sh
 # script to launch GRASS commands
 
+#DEBUG:
+#print_args "$@"
+
 # change console title to name of module
 if [ "$TERM" = "xterm" ] && [ -n "$BASH" ] ; then
    TITLE="GRASS: $1"
@@ -33,9 +36,9 @@
    echo
    echo "ERROR: \"$1\" exited abnormally. Press <enter> to continue."
    read
-elif [ `g.gisenv get=DEBUG` -gt 0 ] ; then
+else
    echo
-   echo "\"$1\" exited normally. Press <enter> to continue."
+   echo "\"$1\" complete. Press <enter> to continue."
    read
 fi