diff options
author | Reinhard Kotucha <reinhard.kotucha@web.de> | 2008-10-26 20:44:28 +0000 |
---|---|---|
committer | Reinhard Kotucha <reinhard.kotucha@web.de> | 2008-10-26 20:44:28 +0000 |
commit | 7925bbdc4e738d87cbbe1661e87521dcb136d1af (patch) | |
tree | 3ba00f773b9da8b4934e900ddc864e93d5bc825f /Master/texmf/scripts | |
parent | 8031cf54c0ac6de1b6e770bfe3eba2baae31dae3 (diff) |
getnonfreefonts: support brace expansion in TEXMFHOME and TEXMFLOCAL.
git-svn-id: svn://tug.org/texlive/trunk@11070 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf/scripts')
-rwxr-xr-x | Master/texmf/scripts/texlive/getnonfreefonts.pl | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/Master/texmf/scripts/texlive/getnonfreefonts.pl b/Master/texmf/scripts/texlive/getnonfreefonts.pl index 99530a25111..f5b83ec0cde 100755 --- a/Master/texmf/scripts/texlive/getnonfreefonts.pl +++ b/Master/texmf/scripts/texlive/getnonfreefonts.pl @@ -153,7 +153,32 @@ sub expand_var { close KPSEWHICH; } -# get TMP|TEMP|TMPDIR environment variable + +sub expand_path { + my $var=shift; + my $pathsep; + my $retstring; + my @retlist; + if (win32) { + open KPSEWHICH, 'kpsewhich --expand-path=$' . "$var |"; + $pathsep=';'; + } else { + open KPSEWHICH, 'kpsewhich --expand-path=\$' . "$var |"; + $pathsep=':'; + } + $retstring=(<KPSEWHICH>); + close KPSEWHICH; + chop $retstring; + @retlist=split $pathsep, $retstring; + if ($opt_debug) { + foreach my $entry (@retlist) { + debug_msg "$var: '$entry'"; + } + debug_msg "$var='$retlist[0]'"; + } + return "$retlist[0]"; +} + if ($opt_debug) { for my $var ("TMP","TEMP","TMPDIR") { @@ -166,6 +191,8 @@ if ($opt_debug) { } +# get TMP|TEMP|TMPDIR environment variable + if (defined $ENV{'TMP'}) { $SYSTMP="$ENV{'TMP'}"; } elsif (defined $ENV{'TEMP'}) { @@ -209,7 +236,7 @@ if ($opt_debug) { $INSTALLROOTNAME=($sys)? 'TEXMFLOCAL':'TEXMFHOME'; -$INSTALLROOT=expand_var "$INSTALLROOTNAME"; +$INSTALLROOT=expand_path "$INSTALLROOTNAME"; ($sys)? debug_msg "sys=true":debug_msg "sys=false"; |