From 79298528102c078a0c50e4dc38a923d014d3a714 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 30 Jul 2012 23:45:27 +0000 Subject: fix quoting and var expansion on Windows git-svn-id: svn://tug.org/texlive/trunk@27259 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/tetex/ChangeLog | 4 ++++ Build/source/texk/tetex/updmap.pl | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'Build/source') diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index f05359eebc9..19218a3f85f 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,7 @@ +2012-07-31 Norbert Preining + + * updmap.pl (main): fix quoting and var expansion on Windows. + 2012-07-30 Norbert Preining * updmap.pl (main): support for multiple entry TEXMFLOCAL. diff --git a/Build/source/texk/tetex/updmap.pl b/Build/source/texk/tetex/updmap.pl index 2049cfa2640..4e8ddc229b3 100755 --- a/Build/source/texk/tetex/updmap.pl +++ b/Build/source/texk/tetex/updmap.pl @@ -220,7 +220,13 @@ sub main { push @used_files, (win32() ? lc($f) : $f); } # - chomp(my $TEXMFLOCALVAR =`kpsewhich --expand-path='\$TEXMFLOCAL'`); + my $TEXMFLOCALVAR; + if (win32()) { + chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`); + } else { + chomp($TEXMFLOCALVAR =`kpsewhich --expand-path='\$TEXMFLOCAL'`); + } + my @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR; chomp(my $TEXMFHOME =`kpsewhich --var-value=TEXMFHOME`); if (win32()) { -- cgit v1.2.3