Do tilde expansion when initializing from TCLLIBPATH and TM env vars

2 files changed, 13 insertions, 2 deletions

diff --git a/library/init.tcl b/library/init.tcl
index 31139dd..d2e3624 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -47,7 +47,15 @@ package require -exact tcl 9.0a4
 
 if {![info exists auto_path]} {
     if {[info exists env(TCLLIBPATH)] && (![interp issafe])} {
-	set auto_path $env(TCLLIBPATH)
+        set auto_path [apply {{} {
+            lmap path $::env(TCLLIBPATH) {
+                # Paths relative to unresolvable home dirs are ignored
+                if {[catch {file tildeexpand $path} expanded_path]} {
+                    continue
+                }
+                set expanded_path
+            }
+        }}]
     } else {
 	set auto_path ""
     }
diff --git a/library/tm.tcl b/library/tm.tcl
index c1a8f8a..88ce4af 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -338,7 +338,10 @@ proc ::tcl::tm::Defaults {} {
         ] {
 	    if {![info exists env($ev)]} continue
 	    foreach p [split $env($ev) $sep] {
-		path add $p
+                # Paths relative to unresolvable home dirs are ignored
+                if {![catch {file tildeexpand $p} expanded_path]} {
+                    path add $expanded_path
+                }
 	    }
 	}
     }