added catch around file type call

diff --git a/ChangeLog b/ChangeLog
index 789f6087132c8d800b015cf6ec6c388281d50ac5..da62ff0daeaa67d32e2a3701cbd4490690e8a1dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-14  Jeff Hobbs  <jeffh@ActiveState.com>
+
+       * tkcon.tcl: added catch around file type call
+
 2001-10-14  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * tkcon.tcl (Init): corrected loading of rcfile when it was in a

diff --git a/tkcon.tcl b/tkcon.tcl
index c719c613c9ac7973bba06a20c68cdec46647ce27..dd3ba3609830a946615aa8b72264c84ecba1b71e 100755 (executable)
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -5189,17 +5189,22 @@ proc ::tkcon::Retrieve {} {
 ## 
 set ::tkcon::PRIV(SCRIPT) [info script]
 if {!$::tkcon::PRIV(WWW) && [string compare $::tkcon::PRIV(SCRIPT) {}]} {
-    while {[string match link [file type $::tkcon::PRIV(SCRIPT)]]} {
-       set link [file readlink $::tkcon::PRIV(SCRIPT)]
-       if {[string match relative [file pathtype $link]]} {
-           set ::tkcon::PRIV(SCRIPT) [file join [file dirname $::tkcon::PRIV(SCRIPT)] $link]
-       } else {
-           set ::tkcon::PRIV(SCRIPT) $link
+    # we use a catch here because some wrap apps choke on 'file type'
+    # because TclpLstat wasn't wrappable until 8.4.
+    catch {
+       while {[string match link [file type $::tkcon::PRIV(SCRIPT)]]} {
+           set link [file readlink $::tkcon::PRIV(SCRIPT)]
+           if {[string match relative [file pathtype $link]]} {
+               set ::tkcon::PRIV(SCRIPT) \
+                       [file join [file dirname $::tkcon::PRIV(SCRIPT)] $link]
+           } else {
+               set ::tkcon::PRIV(SCRIPT) $link
+           }
+       }
+       catch {unset link}
+       if {[string match relative [file pathtype $::tkcon::PRIV(SCRIPT)]]} {
+           set ::tkcon::PRIV(SCRIPT) [file join [pwd] $::tkcon::PRIV(SCRIPT)]
        }
-    }
-    catch {unset link}
-    if {[string match relative [file pathtype $::tkcon::PRIV(SCRIPT)]]} {
-       set ::tkcon::PRIV(SCRIPT) [file join [pwd] $::tkcon::PRIV(SCRIPT)]
     }
 }