From 371de7294db8f76cea8d6aa2e10b383f893c72c9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 17 Jun 2011 23:06:16 +0000 Subject: revert dirname() change due to install warning git-svn-id: svn://tug.org/texlive/trunk@23032 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLUtils.pm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'Master') diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 0051bc91ff6..40f47ac6950 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -526,23 +526,13 @@ Return C<$path> with its trailing C removed. sub dirname { my $path=shift; - my $drive=''; - if (&win32) { + if (win32) { $path=~s!\\!/!g; } - if ($path=~m!^[A-Za-z]\:!) { - $path=~ s/^(.\:)(.*)/$1,$2/; - ($drive, $path)=($1,$2); - } - if ($path=~m!/!) { - $path=~m!(.*)/.*!; # works because of greedy matching - my $dir=$1; - if (length($dir)) { # dirname("foo/bar/baz") -> "foo/bar" - return "$drive$dir"; - } else { # dirname("/baz") -> "/" - return "$drive/"; - } - } else { # dirname("ignore") -> "." + if ($path=~m!/!) { # dirname("foo/bar/baz") -> "foo/bar" + $path=~m!(.*)/.*!; # works because of greedy matching + return $1; + } else { # dirname("ignore") -> "." return "."; } } -- cgit v1.2.3