texlive[59208] Master/texmf-dist/scripts/texlive/tlmgr.pl:

[commits+karl at tug.org]

Revision: 59208
          http://tug.org/svn/texlive?view=revision&revision=59208
Author:   karl
Date:     2021-05-15 19:45:58 +0200 (Sat, 15 May 2021)
Log Message:
-----------
(check_runfiles): do case-insensitive check;
ignore resulting clashes ([cC]herokee.tfm etc.)
which have done no harm for years.

Modified Paths:
--------------
    trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl

Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2021-05-15 13:58:40 UTC (rev 59207)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2021-05-15 17:45:58 UTC (rev 59208)
@@ -5653,17 +5653,20 @@
     }
     # special case for koma-script where doc/src files are in runfiles section
     if ($tlpn eq "koma-script") {
-      @files = grep {!m;^texmf-dist/source/latex/koma-script/;} @files;
-      @files = grep {!m;^texmf-dist/doc/latex/koma-script/;} @files;
+      @files = grep { !m;^texmf-dist/source/latex/koma-script/; } @files;
+      @files = grep { !m;^texmf-dist/doc/latex/koma-script/; } @files;
     }
     push @runtime_files, @files;
   }
 
-  # build the duplicates list.
+  # build the duplicates list; only one duplicate in list, no matter how
+  # many clashing files there actually are.
   my @duplicates = (""); # just to use $duplicates[-1] freely
   my $prev = "";
-  foreach my $f (sort map { TeXLive::TLUtils::basename($_) } @runtime_files) {
-    push (@duplicates, $f) if (($f eq $prev) and not ($f eq $duplicates[-1]));
+  for my $f (sort map { lc(TeXLive::TLUtils::basename($_)) } @runtime_files) {
+    if ($f eq $prev && !($f eq $duplicates[-1])) {
+      push(@duplicates, $f);
+    }
     $prev = $f;
   }
   shift @duplicates; # get rid of the fake 1st value
@@ -5693,13 +5696,12 @@
             |.*-noEmbed\.map
             |ps2mfbas\.mf
             |pstricks\.con
-            |readme.*
             |sample\.bib
             |tex4ht\.env
             |test\.mf
             |texutil\.rb
             |tlmgrgui\.pl
-           )$/x;
+           )$/xi;
     # For the a_.* line above: source*pro has .enc files which differ
     # only in comments, hence the otftotfm-hashed name is the same.
     # Seems like it could happen more or at random with other fonts too.
@@ -5714,6 +5716,7 @@
     # https://tug.org/pipermail/tex-live/2019-December/044530.html
     next if $f
       =~ /^( afoot\.sty
+            |cherokee\.tfm
             |gamma\.mf
             |lexer\.lua
             |ligature\.mf
@@ -5720,24 +5723,29 @@
             |md-utrma\.pfb
             |ot1\.cmap
             |t1\.cmap
-           )$/x;
+            |ut1omlgc\.fd
+           )$/xi;
 
-    my @copies = grep (/\/$f$/, @runtime_files);
+    my @copies = grep (/\/$f$/i, @runtime_files);
     # map files can be duplicated between (but not within) formats.
     if ($f =~ /\.map$/) {
       my $need_check = 0;
       my $prev_dir = "";
       my @cop = @copies; # don't break the outside list
-      map { s#^texmf-dist/fonts/map/(.*?)/.*#$1# } @cop;
-      foreach my $dir (sort @cop ) {
+      map { s!^texmf-dist/fonts/map/(.*?)/.*!$1!; } @cop;
+      foreach my $dir (sort @cop) {
         last if ($need_check = ($dir eq $prev_dir));
         $prev_dir = $dir;
       }
       next unless $need_check;
     }
-    # if all copies are identical, ok, else, complain
+    # if all copies are identical, ok, else complain.
     my $diff = 0;
-    for (my $i = 1; $i < scalar(@copies); $i++) {
+    for (my $i = 1; $i < @copies; $i++) {
+      # there are many duplicates between asymptote/GUI and
+      # asymptote/GUI/pyUIClass; don't omit checks for other .py files.
+      next if $copies[$i] =~ m!asymptote/.*\.py$!;
+      #
       if ($diff = tlcmp("$Master/$copies[$i-1]", "$Master/$copies[$i]")) {
         print "# $f\ndiff $Master/$copies[$i-1] $Master/$copies[$i]\n";
         last;