Index: library/lib/nx-shell.tcl
===================================================================
diff -u -rb8ca306282c9a1000b1c93ffd97f7f4673953f65 -r89f7f5d879f2881445c70e1c5b4be391cabaf6a0
--- library/lib/nx-shell.tcl	(.../nx-shell.tcl)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
+++ library/lib/nx-shell.tcl	(.../nx-shell.tcl)	(revision 89f7f5d879f2881445c70e1c5b4be391cabaf6a0)
@@ -42,7 +42,7 @@
 
 package provide nx::shell 1.1
 
-nx::Object create ::nx::shell2 {
+nx::Object create ::nx::shell {
 
   :public object method onRead {{chan stdin}} {
     append :line [read $chan]
@@ -219,42 +219,6 @@
         interp expose {} try;
       }
     }
-  } 
-  
-}
-
-nx::Object create ::nx::shell {
-  :public object method run {argc argv} {
-    if {$argc == 0} {
-      set prefix ""
-      set line ""
-      while {1} {
-        update
-        if {$line eq ""} {
-          puts -nonewline "% "
-          flush stdout
-        }
-        append line [gets stdin]
-        if {[info complete $line]} {
-          set script [list catch $line [current]::result [current]::opts]
-          set r [uplevel #0 $script]
-          if {$r} {
-            puts [dict get ${:opts} -errorinfo]
-            unset :opts;
-          } else {
-            puts ${:result}
-            unset :result
-          }          
-          set line ""
-          continue
-        }
-        append line \n 
-      }
-    } else {
-      set ::argv [lassign $argv argv0]
-      incr ::argc -1
-      uplevel #0 [list source $argv0]
-    }
   }
 }
 
Index: library/xotcl/xotclsh.in
===================================================================
diff -u -r0956bd063e7aaa155b4dccad0997b381ddd5ec15 -r89f7f5d879f2881445c70e1c5b4be391cabaf6a0
--- library/xotcl/xotclsh.in	(.../xotclsh.in)	(revision 0956bd063e7aaa155b4dccad0997b381ddd5ec15)
+++ library/xotcl/xotclsh.in	(.../xotclsh.in)	(revision 89f7f5d879f2881445c70e1c5b4be391cabaf6a0)
@@ -21,5 +21,5 @@
 
 namespace import -force ::xotcl::*
 
-set exitCode [nx::shell2 run $argc $argv]
+set exitCode [nx::shell run $argc $argv]
 exit $exitCode
Index: library/xotcl/xowish.in
===================================================================
diff -u -r0956bd063e7aaa155b4dccad0997b381ddd5ec15 -r89f7f5d879f2881445c70e1c5b4be391cabaf6a0
--- library/xotcl/xowish.in	(.../xowish.in)	(revision 0956bd063e7aaa155b4dccad0997b381ddd5ec15)
+++ library/xotcl/xowish.in	(.../xowish.in)	(revision 89f7f5d879f2881445c70e1c5b4be391cabaf6a0)
@@ -22,5 +22,5 @@
 
 namespace import -force ::xotcl::*
 
-set exitCode [nx::shell2 run $argc $argv]
+set exitCode [nx::shell run $argc $argv]
 exit $exitCode
Index: nxsh.in
===================================================================
diff -u -r0956bd063e7aaa155b4dccad0997b381ddd5ec15 -r89f7f5d879f2881445c70e1c5b4be391cabaf6a0
--- nxsh.in	(.../nxsh.in)	(revision 0956bd063e7aaa155b4dccad0997b381ddd5ec15)
+++ nxsh.in	(.../nxsh.in)	(revision 89f7f5d879f2881445c70e1c5b4be391cabaf6a0)
@@ -18,6 +18,6 @@
 
 namespace import -force ::nx::*
 
-set exitCode [nx::shell2 run $argc $argv]
+set exitCode [nx::shell run $argc $argv]
 exit $exitCode
 
Index: nxwish.in
===================================================================
diff -u -r0956bd063e7aaa155b4dccad0997b381ddd5ec15 -r89f7f5d879f2881445c70e1c5b4be391cabaf6a0
--- nxwish.in	(.../nxwish.in)	(revision 0956bd063e7aaa155b4dccad0997b381ddd5ec15)
+++ nxwish.in	(.../nxwish.in)	(revision 89f7f5d879f2881445c70e1c5b4be391cabaf6a0)
@@ -21,5 +21,5 @@
 
 namespace import -force ::nx::*
 
-set exitCode [nx::shell2 run $argc $argv]
+set exitCode [nx::shell run $argc $argv]
 exit $exitCode
Index: win/makefile.vc
===================================================================
diff -u -r5b7ad965735edc79a0e0c1e7efe977c2b8bd6f8f -r89f7f5d879f2881445c70e1c5b4be391cabaf6a0
--- win/makefile.vc	(.../makefile.vc)	(revision 5b7ad965735edc79a0e0c1e7efe977c2b8bd6f8f)
+++ win/makefile.vc	(.../makefile.vc)	(revision 89f7f5d879f2881445c70e1c5b4be391cabaf6a0)
@@ -452,7 +452,7 @@
 !else
 	@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
 !endif
-	@echo lappend auto_path $(ROOT) .; puts $$auto_path; package req nx::shell; nx::shell run $$argc $$argv; > nsfshell.tcl
+	@echo lappend auto_path $(ROOT) .; puts $$auto_path; package req nx::shell 1.1; exit [nx::shell run $$argc $$argv;] > nsfshell.tcl
 	$(DEBUGGER) $(TCLSH) nsfshell.tcl $(SCRIPT)
 	@del nsfshell.tcl