From 704973ed15eaaa4fab4987be0edacb603a4a63db Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 10 Mar 2009 12:02:08 +0000 Subject: more fixes for TLWinGoo.pm from Tomek git-svn-id: svn://tug.org/texlive/trunk@12357 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLWinGoo.pm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'Master/tlpkg/TeXLive/TLWinGoo.pm') diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm index b1cfe76d1ea..0057bde14fb 100644 --- a/Master/tlpkg/TeXLive/TLWinGoo.pm +++ b/Master/tlpkg/TeXLive/TLWinGoo.pm @@ -286,19 +286,14 @@ values as environment variable and returns the result. =cut -sub expand_env { - my $key = shift; - foreach my $k (keys %ENV) { - return $ENV{$k} if (uc($k) eq uc($key)); - } - - return "%$key%"; -} - sub expand_string { - $s = shift @_; - $s =~ s/%([^%;]+)%/expand_env($1)/eg; + my ($s) = @_; + $s =~ s/%([^%;]+)%/expand_var($1)/eg; return $s; + sub expand_var { + my ($key) = @_; + return ($ENV{$key} ? $ENV{$key} : "%$key%"); + } } =pod @@ -324,7 +319,7 @@ sub is_a_texdir { $d =~ s/\\/\//g; $d = $d . '/' unless $d =~ m!/$!; # don't consider anything under %systemroot% a texdir - my $sr = uc(expand_string($ENV{'SystemRoot'})); + my $sr = uc($ENV{'SystemRoot'}); $sr =~ s/\\/\//g; $sr = $sr . '/' unless $sr =~ m!/$!; return 0 if index($d, $sr)==0; -- cgit v1.2.3