summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-06-17 23:45:54 +0000
committerKarl Berry <karl@freefriends.org>2011-06-17 23:45:54 +0000
commit0177c4eac3a7297d360b1625f0776b1d3e908e7a (patch)
tree5c98039f78b7f6c187c080a466e010e021de469c
parent5667d0c2a47a85fc3fb0ad53e2d4e7af13964e4e (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@23035 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tetex/updmap.man2
-rwxr-xr-xMaster/texmf/scripts/tetex/updmap.pl14
2 files changed, 7 insertions, 9 deletions
diff --git a/Build/source/texk/tetex/updmap.man b/Build/source/texk/tetex/updmap.man
index a4d08594617..a89b4cdf766 100644
--- a/Build/source/texk/tetex/updmap.man
+++ b/Build/source/texk/tetex/updmap.man
@@ -11,7 +11,7 @@ updmap-sys \- manage TeX font maps, system-wide
.B updmap-sys
[\fIOPTION\fR] ... [\fICOMMAND\fR]
.SH DESCRIPTION
-updmap (TeX Live) version $Id: updmap.pl 23018 2011\-06\-16 20:35:36Z karl $
+updmap (TeX Live) version $Id: updmap.pl 23034 2011\-06\-17 23:44:39Z karl $
.PP
Update the default font map files used by pdftex, dvips, and dvipdfm(x),
as determined by the configuration file updmap.cfg (the one returned by
diff --git a/Master/texmf/scripts/tetex/updmap.pl b/Master/texmf/scripts/tetex/updmap.pl
index ae22fb2e83a..2f988ca926a 100755
--- a/Master/texmf/scripts/tetex/updmap.pl
+++ b/Master/texmf/scripts/tetex/updmap.pl
@@ -12,7 +12,7 @@ BEGIN {
unshift (@INC, "$TEXMFROOT/tlpkg");
}
-my $version = '$Id: updmap.pl 23018 2011-06-16 20:35:36Z karl $';
+my $version = '$Id: updmap.pl 23034 2011-06-17 23:44:39Z karl $';
use strict;
use TeXLive::TLUtils qw(mkdirhier mktexupd win32);
@@ -464,24 +464,22 @@ sub locateWeb2c {
###############################################################################
# locateMap (file ...)
-# apply kpsewhich with format 'dvips config'
+# apply kpsewhich with format 'map'
#
sub locateMap {
my @maps = @_;
- my @files;
-
return @maps if ($#maps < 0);
- @files = `kpsewhich --format=map @maps`;
+ my @files = `kpsewhich --format=map @maps`;
chomp @files;
foreach my $map (@maps) {
- push @missing, $map if (! grep /\/$map$/, @files);
+ push @missing, $map if (! grep /\/$map(\.map)?$/, @files);
}
+
if (wantarray) {
return @files;
- }
- else {
+ } else {
return $files[0];
}
}