diff options
| author | Norbert Preining <preining@logic.at> | 2012-07-31 05:10:29 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2012-07-31 05:10:29 +0000 |
| commit | 5b65f841417ae9fc04837485e3c3e4a603755abd (patch) | |
| tree | 5c4e333b9e2400f1db4e0d29c3a3ae9140a09107 /Build/source/texk/tetex | |
| parent | 62f07dd85a867b96e6786226a28afcbd9ab874ee (diff) | |
updmap.pl (main): and another fix, this time for PATH separator
git-svn-id: svn://tug.org/texlive/trunk@27264 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/tetex')
| -rw-r--r-- | Build/source/texk/tetex/ChangeLog | 1 | ||||
| -rwxr-xr-x | Build/source/texk/tetex/updmap.pl | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 19218a3f85f..5bf9b8f1c2e 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,6 +1,7 @@ 2012-07-31 Norbert Preining <preining@logic.at> * updmap.pl (main): fix quoting and var expansion on Windows. + * updmap.pl (main): and another fix, this time for PATH separator 2012-07-30 Norbert Preining <preining@logic.at> diff --git a/Build/source/texk/tetex/updmap.pl b/Build/source/texk/tetex/updmap.pl index 4e8ddc229b3..710c61cd9c4 100755 --- a/Build/source/texk/tetex/updmap.pl +++ b/Build/source/texk/tetex/updmap.pl @@ -53,6 +53,7 @@ reset_root_home(); chomp(my $TEXMFMAIN = `kpsewhich --var-value=TEXMFMAIN`); chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`); +chomp(my $TEXMFHOME = `kpsewhich -var-value=TEXMFHOME`); # make sure that on windows *everything* is in lower case for comparison if (win32()) { @@ -60,6 +61,7 @@ if (win32()) { $TEXMFVAR = lc($TEXMFVAR); $TEXMFCONFIG = lc($TEXMFCONFIG); $TEXMFROOT = lc($TEXMFROOT); + $TEXMFHOME = lc($TEXMFHOME); } @@ -221,17 +223,13 @@ sub main { } # my $TEXMFLOCALVAR; + my @TEXMFLOCAL; if (win32()) { chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`); + @TEXMFLOCAL = map { lc } split(/;/ , $TEXMFLOCALVAR); } else { chomp($TEXMFLOCALVAR =`kpsewhich --expand-path='\$TEXMFLOCAL'`); - } - - my @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR; - chomp(my $TEXMFHOME =`kpsewhich --var-value=TEXMFHOME`); - if (win32()) { - @TEXMFLOCAL = lc(@TEXMFLOCAL); - $TEXMFHOME = lc($TEXMFHOME); + @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR; } # # search for TEXMFLOCAL/web2c/updmap.cfg |