tweak

diff --git a/ChangeLog b/ChangeLog
index 221bdd27388d5b4ab45367ad80bcbfaaa051edbc..db55a3cd616c9492ec10a978d80283e7e2a0315c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2003-02-24  Jean-Claude Wippler  <jcw@equi4.com>
 
+       * pkgIndex.tcl, pkgIndex.tcl.in: starkit rev bumped to 1.2
        * starkit.tcl: more contexts, panic ok if "." already gone
 
 2003-02-23  Jeff Hobbs  <jeffh@ActiveState.com>

diff --git a/library/pkgIndex.tcl b/library/pkgIndex.tcl
index 5f719ec8a72f9c203a06103f73ba758c44d813ce..638bc62bb80e34f8df1ba33e6dba7ff4072bf1d7 100644 (file)
--- a/library/pkgIndex.tcl
+++ b/library/pkgIndex.tcl
@@ -39,7 +39,7 @@ proc loadvfs {dll} {
 }
 
 package ifneeded vfs 1.2 [list loadvfs $dll]
-package ifneeded starkit 1.1 [list source [file join $dir starkit.tcl]]
+package ifneeded starkit 1.2 [list source [file join $dir starkit.tcl]]
 package ifneeded vfslib 1.3.1 [list source [file join $dir vfslib.tcl]]
 
 # Old

diff --git a/library/pkgIndex.tcl.in b/library/pkgIndex.tcl.in
index 7affa1f23db452904c92918bd7cfa71742d97caa..12b16fefd2e00d52cd619ce993a758fb56a1a939 100644 (file)
--- a/library/pkgIndex.tcl.in
+++ b/library/pkgIndex.tcl.in
@@ -26,7 +26,7 @@ proc loadvfs {dll} {
 }
 
 package ifneeded vfs          1.0 [list loadvfs $dll]
-package ifneeded starkit      1.1 [list source [file join $dir starkit.tcl]]
+package ifneeded starkit      1.2 [list source [file join $dir starkit.tcl]]
 package ifneeded vfslib     1.3.1 [list source [file join $dir vfslib.tcl]]
 
 # Old

diff --git a/library/starkit.tcl b/library/starkit.tcl
index 7265c99777abd535cecc37b7d6ebc8ebff408f83..6fa3194ef4ddf0cd40f76172605ccb3b10d6fb6b 100644 (file)
--- a/library/starkit.tcl
+++ b/library/starkit.tcl
@@ -1,7 +1,7 @@
 # Starkit support, see http://www.equi4.com/starkit/
 # by Jean-Claude Wippler, July 2002
 
-package provide starkit 1.1
+package provide starkit 1.2
 
 # Starkit scripts can launched in a number of ways:
 #   - wrapped or unwrapped
@@ -42,10 +42,14 @@ namespace eval starkit {
 
     # called from the startup script of a starkit to init topdir and auto_path
     # returns how the script was launched: starkit, starpack, unwrapped, or
-    # sourced (Jan 2003: also tclhttpd or plugin)
+    # sourced (2003: also tclhttpd, plugin, or service)
     proc startup {} {
        global argv0
-       variable topdir ;# the root directory (while the starkit is mounted)
+
+       # 2003/02/11: new behavior, if starkit::topdir exists, don't disturb it
+       if {![info exists starkit::topdir]} {
+         variable topdir ;# the root directory (while the starkit is mounted)
+       }
 
        set script [file normalize [info script]]
        set topdir [file dirname $script]
@@ -93,7 +97,7 @@ namespace eval starkit {
     # terminate with an error message, using most appropriate mechanism
     proc panic {msg} {
        if {[info commands wm] ne ""} {
-           wm withdraw .
+           catch { wm withdraw . }
            tk_messageBox -icon error -message $msg -title "Fatal error"
        } elseif {[info commands ::eventlog] ne ""} {
            eventlog error $msg