summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-07-31 05:11:03 +0000
committerNorbert Preining <preining@logic.at>2012-07-31 05:11:03 +0000
commite765857100a75ca0752926e3d0f8e967b9b046a7 (patch)
treecec7930e4728da846215109bdd663104d533b9f4 /Master
parent5b65f841417ae9fc04837485e3c3e4a603755abd (diff)
sync from source
git-svn-id: svn://tug.org/texlive/trunk@27265 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf/scripts/tetex/updmap.pl16
1 files changed, 7 insertions, 9 deletions
diff --git a/Master/texmf/scripts/tetex/updmap.pl b/Master/texmf/scripts/tetex/updmap.pl
index e6540b3a664..68d05bb82eb 100755
--- a/Master/texmf/scripts/tetex/updmap.pl
+++ b/Master/texmf/scripts/tetex/updmap.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# mupdmap: utility to maintain map files for outline fonts.
-# $Id: updmap.pl 27259 2012-07-30 23:45:27Z preining $
+# $Id: updmap.pl 27264 2012-07-31 05:10:29Z preining $
#
# Copyright 2011, 2012 Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -33,7 +33,7 @@ BEGIN {
}
-my $version = '$Id: updmap.pl 27259 2012-07-30 23:45:27Z preining $';
+my $version = '$Id: updmap.pl 27264 2012-07-31 05:10:29Z preining $';
use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
use strict;
@@ -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