summaryrefslogtreecommitdiff
path: root/Master/texmf/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf/scripts')
-rwxr-xr-xMaster/texmf/scripts/texlive/getnonfreefonts.pl31
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";