From: Andreas Kupries <andreas_kupries@users.sourceforge.net>
Date: Tue, 25 Nov 2008 17:18:23 +0000 (+0000)
Subject: 	* library/starkit.tcl (_startup, autoextend): Replaced the buggy
X-Git-Tag: vfs-1-4~16
X-Git-Url: http://privyetmir.co.uk/gitweb?a=commitdiff_plain;h=059a5ffc7b9f431d8a7c9e6d383ace2a9f2be1c3;p=tclvfs

	* library/starkit.tcl (_startup, autoextend): Replaced the buggy
	  'vfs::filesystem fullynormalize' with the ok 'fullnormalize'
	  defined in the same file. Now 'starkit::startup' handles
	  sym-links to a starpack ok when detecting the wrap mode.
---

diff --git a/ChangeLog b/ChangeLog
index c7f3844..6c01e4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-20  Andreas Kupries  <andreask@activestate.com>
+
+	* library/starkit.tcl (_startup, autoextend): Replaced the buggy
+	  'vfs::filesystem fullynormalize' with the ok 'fullnormalize'
+	  defined in the same file. Now 'starkit::startup' handles
+	  sym-links to a starpack ok when detecting the wrap mode.
+
 2008-10-17  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* pkgIndex.tcl.in, library/pkgIndex.tcl: update vfs::tar to 0.91
diff --git a/library/starkit.tcl b/library/starkit.tcl
index d16f008..ac0bb81 100644
--- a/library/starkit.tcl
+++ b/library/starkit.tcl
@@ -72,16 +72,16 @@ namespace eval starkit {
 	# 2003/02/11: new behavior, if starkit::topdir exists, don't disturb it
 	if {![info exists starkit::topdir]} { variable topdir }
 
-	set script [vfs::filesystem fullynormalize [info script]]
+	set script [fullnormalize [info script]]
 	set topdir [file dirname $script]
 
-	if {$topdir eq [vfs::filesystem fullynormalize [info nameofexe]]} { return starpack }
+	if {$topdir eq [fullnormalize [info nameofexe]]} { return starpack }
 
 	# pkgs live in the $topdir/lib/ directory
 	set lib [file join $topdir lib]
 	if {[file isdir $lib]} { autoextend $lib }
 
-	set a0 [vfs::filesystem fullynormalize $argv0]
+	set a0 [fullnormalize $argv0]
 	if {$topdir eq $a0} { return starkit }
 	if {$script eq $a0} { return unwrapped }
 
@@ -100,7 +100,7 @@ namespace eval starkit {
     # append an entry to auto_path if it's not yet listed
     proc autoextend {dir} {
 	global auto_path
-	set dir [vfs::filesystem fullynormalize $dir]
+	set dir [fullnormalize $dir]
 	if {[lsearch $auto_path $dir] < 0} {
 	    lappend auto_path $dir
 	}