summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorReinhard Kotucha <reinhard.kotucha@web.de>2011-06-08 18:58:09 +0000
committerReinhard Kotucha <reinhard.kotucha@web.de>2011-06-08 18:58:09 +0000
commit0895a4204849575663399a4a569f5145ca07c53a (patch)
tree961d6c3f98a29d5646ddbb7073fc8f3bd1e48a32 /Build
parent868f7938977e661e426c1a5336d8a04ab7a74507 (diff)
updmap.pl: strip trailing spaces from config file
git-svn-id: svn://tug.org/texlive/trunk@22869 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/texk/tetex/updmap.pl9
1 files changed, 6 insertions, 3 deletions
diff --git a/Build/source/texk/tetex/updmap.pl b/Build/source/texk/tetex/updmap.pl
index 407bac9e082..a1df217237a 100755
--- a/Build/source/texk/tetex/updmap.pl
+++ b/Build/source/texk/tetex/updmap.pl
@@ -462,8 +462,12 @@ sub cfgval {
if ($#cfg < 0) {
open FILE, "<$cnfFile" or die "can't open configuration file $cnfFile: $!";
- @cfg = <FILE>;
+ while (<FILE>) {
+ s/\s*$//; # strip trailing spaces
+ push @cfg, $_;
+ }
close FILE;
+ chomp (@cfg);
}
for my $line (@cfg) {
if ($line =~ m/^\s*${variable}[\s=]+(.*)\s*$/) {
@@ -573,7 +577,6 @@ sub locateMap {
my @maps = @_;
my @files;
- chomp @maps;
return @maps if ($#maps < 0);
@files = `kpsewhich --format=map @maps`;
@@ -581,7 +584,7 @@ sub locateMap {
foreach my $map (@maps) {
push @missing, $map if (! grep /\/$map$/, @files);
- }
+ }
if (wantarray) {
return @files;
}