diff options
| -rwxr-xr-x | Master/texmf/scripts/tetex/updmap.pl | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/Master/texmf/scripts/tetex/updmap.pl b/Master/texmf/scripts/tetex/updmap.pl index 6e6235e19d0..38d55d1907b 100755 --- a/Master/texmf/scripts/tetex/updmap.pl +++ b/Master/texmf/scripts/tetex/updmap.pl @@ -16,7 +16,6 @@ # # TODO # - check all other invocations -# - after TL2012? remove -oldmode version # - after TL2012? Maybe remove support for reading updmap-local.cfg # @@ -63,7 +62,6 @@ my $alldata; my $updLSR; my @cmdline_options = ( - "oldmode", "listfiles", "cnffile=s@", "copy", @@ -209,25 +207,7 @@ sub main { my @all_files = `kpsewhich -all updmap.cfg`; chomp(@all_files); my @used_files; - # - # in --oldmode we ignore texmf/web2c/updmap.cfg and reorder some - # order to get things right - # without --oldmode everything will be used as default to, i.e. - # the order is given by kpsewhich -all updmap.cfg - if (!$opts{"oldmode"}) { - push @used_files, @all_files; - } else { - # --oldmode - for my $f (@all_files) { - # make sure that all file names are lower case on windows for comparison - $f = lc($f) if win32(); - if ($f =~ m!\Q$TEXMFROOT\E/texmf/web2c/updmap.cfg!) { - warning("Ignoring $f, it is only a sample file!\n"); - } else { - push @used_files, $f; - } - } - } + push @used_files, @all_files; # # reorder used files: since we ship and manage with tlmgr # the file in TEXMFSYSCONFIG, and TEXMFLOCAL has *lower* priority @@ -353,8 +333,23 @@ sub main { if ($opts{'syncwithtrees'}) { my @missing = read_map_files(); if (@missing) { - print "Missing map files found, disabling\n @missing\nin $changes_config_file\n"; + print "Missing map files found, disabling\n"; + for my $m (@missing) { + my $orig = $alldata->{'maps'}{$m}{'origin'}; + print "\t$m (in $orig)\n"; + } + print "in $changes_config_file\n"; + print "Do you really want to continue (y/N)? "; + my $answer = <STDIN>; + $answer = "n" if !defined($answer); + chomp($answer); + print "answer =$answer=\n"; + if ($answer ne "y" && $answer ne "Y") { + print "Please fix manually before running updmap(-sys) again!\n"; + exit 0; + } $changed ||= enable_disable_maps(@missing); + print "finished.\n"; # the original script did not run any update of the map files here, # should we do that? } @@ -368,7 +363,6 @@ sub main { if ($opts{'edit'}) { if ($opts{"dry-run"}) { printf STDERR "No, are you joking, you want to edit with --dry-run?\n"; - printf STDERR "Not doing that, bye bye!\n"; exit 1; } # it's not a good idea to edit updmap.cfg manually these days, |