diff options
| author | sebres <sebres@users.sourceforge.net> | 2020-06-22 18:11:58 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2020-06-22 18:11:58 (GMT) |
| commit | 034105d1bc0bc47dbb69837dd578975bff1c2255 (patch) | |
| tree | 7800e738c7114444767300d0bcaff12c2439598d /library/init.tcl | |
| parent | 32cb6e1608b379ff45355ddb8b5ff0b0ab426053 (diff) | |
| parent | fbeaf61e535ccb335ac9bfeb6fa011c4b1be94fd (diff) | |
| download | tcl-034105d1bc0bc47dbb69837dd578975bff1c2255.zip tcl-034105d1bc0bc47dbb69837dd578975bff1c2255.tar.gz tcl-034105d1bc0bc47dbb69837dd578975bff1c2255.tar.bz2 | |
merge 8.6
Diffstat (limited to 'library/init.tcl')
| -rw-r--r-- | library/init.tcl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/library/init.tcl b/library/init.tcl index 51acbf1..3f1f7ab 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -16,7 +16,7 @@ if {[info commands package] == ""} { error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]" } -package require -exact Tcl 8.6.9 +package require -exact Tcl 8.6.10 # Compute the auto path to use in this interpreter. # The values on the path come from several locations: @@ -58,13 +58,13 @@ namespace eval tcl { if {$Dir ni $::auto_path} { lappend ::auto_path $Dir } - catch { + if {[info exists ::tcl_pkgPath]} { catch { foreach Dir $::tcl_pkgPath { if {$Dir ni $::auto_path} { lappend ::auto_path $Dir } } - } + }} if {![interp issafe]} { variable Path [encoding dirs] @@ -692,7 +692,9 @@ proc auto_execok name { } set path "[file dirname [info nameof]];.;" - if {[info exists env(WINDIR)]} { + if {[info exists env(SystemRoot)]} { + set windir $env(SystemRoot) + } elseif {[info exists env(WINDIR)]} { set windir $env(WINDIR) } if {[info exists windir]} { |