Index: library/xotcl/xotclsh.in
===================================================================
diff -u -N -rf6b33f642a1d30f8d7b44c556c86302f8539be3c -r4b929805d1acbf4fd07b6a969c2223467416523b
--- library/xotcl/xotclsh.in	(.../xotclsh.in)	(revision f6b33f642a1d30f8d7b44c556c86302f8539be3c)
+++ library/xotcl/xotclsh.in	(.../xotclsh.in)	(revision 4b929805d1acbf4fd07b6a969c2223467416523b)
@@ -11,38 +11,16 @@
 puts  [info nameofexecutable]
 
 #
-# Tiny scripted replacement of a binary nxsh. This script can be used
-# as interactive shell for testing or like a regular shell with the !#
+# Tiny scripted replacement of a binary xotclsh. This script can be used
+# as interactive shell for testing or like a regular shell with the #!
 # markup in the first line of a script. It is designed to work with
 # multiple installed shells during development. For installed
 # versions, it should be sufficient to remove the first line.
 #
+
 package require XOTcl 2.0
+package require nx::shell
+
 namespace import -force ::xotcl::*
 
-if {$argc == 0} {
-  set prefix ""
-  set line ""
-  while {1} {
-    if {$line eq ""} {
-       puts -nonewline "% "
-       flush stdout
-    }
-    append line [gets stdin]
-    if {[info complete $line]} {
-      if {[catch $line result]} {
-	puts $::errorInfo
-      } else {
-	puts $result
-      }
-      set line ""
-      continue
-    }
-    append line \n 
-  }
-} else {
-  set argv0 [lindex $argv 0]
-  set argv  [lreplace $argv 0 0]
-  incr argc -1
-  source $argv0
-}
+nx::shell run $argc $argv