support extensionless Map names (but not files), since sh updmap did

git-svn-id: svn://tug.org/texlive/trunk@23034 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 11 insertions, 7 deletions

diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index eccade77090..b014d8b475b 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-18  Karl Berry  <karl@tug.org>
+
+	* updmap.pl (locateMap): allow "Map foo" (without the ".map"),
+	as the sh updmap map.  (The actual file still being foo.map.)
+	Report from Peter Dyballa, 15 Jun 2011 10:04:36.
+
 2011-06-16  Karl Berry  <karl@tug.org>
 
 	* updmap.pl (help): add more info and modify to work with help2man.
diff --git a/Build/source/texk/tetex/updmap.pl b/Build/source/texk/tetex/updmap.pl
index 39d407eb33f..062cf4dc5dc 100755
--- a/Build/source/texk/tetex/updmap.pl
+++ b/Build/source/texk/tetex/updmap.pl
@@ -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];
   }
 }