texlive[52423] Master/install-tl: (do_install_packages): install

[commits+karl at tug.org]

Revision: 52423
          http://tug.org/svn/texlive?view=revision&revision=52423
Author:   karl
Date:     2019-10-18 00:32:30 +0200 (Fri, 18 Oct 2019)
Log Message:
-----------
(do_install_packages): install critical packages
first via sort subroutine.

Modified Paths:
--------------
    trunk/Master/install-tl

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2019-10-17 21:43:09 UTC (rev 52422)
+++ trunk/Master/install-tl	2019-10-17 22:32:30 UTC (rev 52423)
@@ -2125,13 +2125,22 @@
 
 sub do_install_packages {
   # let's install the critical packages first, since they are the most
-  # likely to fail, and nothing is usable without them.
-  my @what = @TeXLive::TLConfig::CriticalPackagesList;
-  foreach my $package (sort keys %install) {
-    if ($install{$package} == 1
-        && $package !~ m/$CriticalPackagesRegexp/) {
-      push (@what, $package)
-    }
+  # likely to fail (so let's fail early), and nothing is usable without them.
+  my @what = ();
+  foreach my $package (sort {
+      if ($a =~ /$CriticalPackagesRegexp/) {
+        if ($b =~ /$CriticalPackagesRegexp/) {
+          return $a cmp $b; # both critical
+        } else {
+          return -1; # critical before non-critical
+        }
+      } elsif ($b =~ /$CriticalPackagesRegexp/) {
+        return 1; # critical before non-critical 
+      } else {
+        return $a cmp $b;
+      }
+    } keys %install) {
+    push (@what, $package) if ($install{$package} == 1);
   }
   # temporary unset the localtlpdb options responsible for
   # running all kind of postactions, since install_packages