summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2008-07-02 09:18:43 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2008-07-02 09:18:43 +0000
commit500733aadf5edae8485a862e0898918ebfe1e485 (patch)
tree9425dd6bad3bd5b0a26f4635cace37e8efc86fa6
parent2cfda9bff2bac0ffb0e5a75676dd84c8a47a4da8 (diff)
updmap.pl: dir => $ENV{'COMSPEC'} /c dir
git-svn-id: svn://tug.org/texlive/trunk@9152 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf/scripts/tetex/updmap.pl40
1 files changed, 20 insertions, 20 deletions
diff --git a/Master/texmf/scripts/tetex/updmap.pl b/Master/texmf/scripts/tetex/updmap.pl
index bf9b72b7f7d..d07a5926452 100644
--- a/Master/texmf/scripts/tetex/updmap.pl
+++ b/Master/texmf/scripts/tetex/updmap.pl
@@ -255,7 +255,7 @@ exit 0;
###############################################################################
-# mkdirhier(directory)
+# mkdirhier(directory)
# create a directory and parent directories as needed
###############################################################################
sub mkdirhier {
@@ -295,7 +295,7 @@ sub equalize_file {
for (@lines) {
s/\s*${comment}.*// if (defined $comment); # remove comments
next if /^\s*$/; # remove empty lines
- s/\s+/ /g; # replace multiple whitespace chars by a single one
+ s/\s+/ /g; # replace multiple whitespace chars by a single one
push @temp, $_;
}
return join('X', sort(@temp));
@@ -320,7 +320,7 @@ sub files_are_different {
###############################################################################
-# files_are_equal(file_A, file_B[, comment_char])
+# files_are_equal(file_A, file_B[, comment_char])
# compare two equalized files. Same as files_are_different() with
# return value inverted.
###############################################################################
@@ -773,7 +773,7 @@ sub setupOutputDir {
$tf = "";
}
}
-
+
# Try something relative to config file, fall back to $TEXMFMAIN.
if (! $tf) {
$tf = $cnfFile;
@@ -785,7 +785,7 @@ sub setupOutputDir {
}
$tf = $TEXMFMAIN if (! $tf);
}
-
+
$od = "$tf/$rel";
}
@@ -829,7 +829,7 @@ sub setupCfgFile {
&stop_redirection;
}
}
-
+
$cnfFile = &locateWeb2c("updmap.cfg");
if ($cnfFile) {
print "using config file $cnfFile\n" if (! $quiet);
@@ -972,19 +972,19 @@ sub mkMaps {
$mode = &cfgval("LW35");
$mode = "URWkb" unless (defined $mode);
-
+
$dvipsPreferOutline = &cfgval("dvipsPreferOutline");
$dvipsPreferOutline = 1 unless (defined $dvipsPreferOutline);
-
+
$dvipsDownloadBase35 = &cfgval("dvipsDownloadBase35");
$dvipsDownloadBase35 = 0 unless (defined $dvipsDownloadBase35);
-
+
$pdftexDownloadBase14 = &cfgval("pdftexDownloadBase14");
$pdftexDownloadBase14 = 0 unless (defined $pdftexDownloadBase14);
-
+
$dvipdfmDownloadBase14 = &cfgval("dvipdfmDownloadBase14");
$dvipdfmDownloadBase14 = 0 unless (defined $dvipdfmDownloadBase14);
-
+
if (! $quiet) {
print "\
updmap is creating new map files using the following configuration:\
@@ -1010,13 +1010,13 @@ updmap is creating new map files using the following configuration:\
my @tmp2 = &catMaps('^Map');
# Create psfonts_t1.map, psfonts_pk.map, ps2pk.map and pdftex.map:
- for my $file ("$dvipsoutputdir/download35.map",
- "$dvipsoutputdir/builtin35.map",
- "$dvipsoutputdir/psfonts_t1.map",
- "$dvipsoutputdir/psfonts_pk.map",
- "$pdftexoutputdir/pdftex_dl14.map",
- "$pdftexoutputdir/pdftex_ndl14.map",
- "$dvipdfmoutputdir/dvipdfm_dl14.map",
+ for my $file ("$dvipsoutputdir/download35.map",
+ "$dvipsoutputdir/builtin35.map",
+ "$dvipsoutputdir/psfonts_t1.map",
+ "$dvipsoutputdir/psfonts_pk.map",
+ "$pdftexoutputdir/pdftex_dl14.map",
+ "$pdftexoutputdir/pdftex_ndl14.map",
+ "$dvipdfmoutputdir/dvipdfm_dl14.map",
"$dvipdfmoutputdir/dvipdfm_ndl14.map",
"$dvipsoutputdir/ps2pk.map") {
open FILE, ">$file";
@@ -1104,7 +1104,7 @@ updmap is creating new map files using the following configuration:\
"$dvipsoutputdir/ps2pk.map") {
if ($^O=~/^MSWin(32|64)$/) {
$f =~ s@/@\\@g; $f = "\"$f\"" if ($f =~ m/\s/);
- @lines = `dir /b /s $f`; # rk. Suppress header and footer from dir output.
+ @lines = `$ENV{'COMSPEC'} /c dir /b /s $f`; # rk. Suppress header and footer from dir output.
} else {
@lines = `ls -l $f`;
}
@@ -1142,7 +1142,7 @@ sub main {
my $bakFile = $cnfFile;
$bakFile =~ s/\.cfg$/.bak/;
&copyFile($cnfFile, $bakFile);
-
+
my $cmd = '';
if ($opt_edit) {