diff options
-rwxr-xr-x | Master/texmf/scripts/tetex/updmap.pl | 3 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/Master/texmf/scripts/tetex/updmap.pl b/Master/texmf/scripts/tetex/updmap.pl index dc665fbc81e..286d7053007 100755 --- a/Master/texmf/scripts/tetex/updmap.pl +++ b/Master/texmf/scripts/tetex/updmap.pl @@ -1347,6 +1347,9 @@ sub save_updmap { # # update lsR database $updLSR->{add}($fn); + $updLSR->{exec}(); + # reset the LSR stuff, otherwise we add files several times + $updLSR->{reset}(); # return 1; } diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 12e7c8a4ce2..6d385578337 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -3857,9 +3857,9 @@ sub mktexupd { $files{$file}=1; } }, - # "reset" => sub { - # %files=(); - # }, + "reset" => sub { + %files=(); + }, "mustexist" => sub { $mustexist=shift; }, @@ -3880,12 +3880,14 @@ sub mktexupd { foreach my $path (keys %files) { foreach my $db (@texmfdbs) { $db=substr($db, -1) if ($db=~m|/$|); # strip leading / - if (substr($path, 0, length("$db/")) eq "$db/") { + $db = lc($db) if win32(); + $up = (win32() ? lc($path) : $path); + if (substr($up, 0, length("$db/")) eq "$db/") { # we appended a / because otherwise "texmf" is recognized as a # substring of "texmf-dist". - my $path='./' . substr($path, length("$db/")); + my $np = './' . substr($up, length("$db/")); my ($dir, $file); - $_=$path; + $_=$np; ($dir, $file) = m|(.*)/(.*)|; $dbs{$db}{$dir}{$file}=1; } |