texlive[62052] Master: resilient installation: move list of extra

[commits+preining at tug.org]

Revision: 62052
          http://tug.org/svn/texlive?view=revision&revision=62052
Author:   preining
Date:     2022-02-17 01:39:03 +0100 (Thu, 17 Feb 2022)
Log Message:
-----------
resilient installation: move list of extra install packages to TLConfig

Modified Paths:
--------------
    trunk/Master/install-tl
    trunk/Master/tlpkg/TeXLive/TLConfig.pm

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2022-02-16 23:07:18 UTC (rev 62051)
+++ trunk/Master/install-tl	2022-02-17 00:39:03 UTC (rev 62052)
@@ -2143,11 +2143,7 @@
   #
   my @criticalwhat = ();
   my @what = ();
-  my @surely_fail_packages = @CriticalPackagesList;
-  # texlive-scripts are necessary for mktexlsr, updmap, fmtutil, ...
-  # the installation cannot continue without those
-  # TODO for Windows ... what else is needed? luatex?
-  push @surely_fail_packages, "texlive-scripts";
+  my @surely_fail_packages = ( @CriticalPackagesList, @TeXLive::TLConfig::InstallExtraRequiredPackages );
   for my $package (keys %install) {
     if (member($package, @surely_fail_packages)) {
       push @criticalwhat, $package if ($install{$package} == 1);

Modified: trunk/Master/tlpkg/TeXLive/TLConfig.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLConfig.pm	2022-02-16 23:07:18 UTC (rev 62051)
+++ trunk/Master/tlpkg/TeXLive/TLConfig.pm	2022-02-17 00:39:03 UTC (rev 62052)
@@ -41,6 +41,7 @@
     $TeXLiveURL
     @CriticalPackagesList
     $CriticalPackagesRegexp
+    @InstallExtraRequiredPackages
     $WindowsMainMenuName
     $RelocPrefix
     $RelocTree
@@ -122,6 +123,16 @@
   $CriticalPackagesRegexp = '^(texlive\.infra|tlperl\.win32$)';
 }
 
+
+# Extra package that are required for installation and installed
+# during the first run of the installer.
+# texlive-scripts are necessary for mktexlsr, updmap, fmtutil, ...
+# the installation cannot continue without those
+our @InstallExtraRequiredPackages = qw/texlive.scripts/;
+if ($^O =~ /^MSWin/i) {
+  push @InstallExtraRequiredPackages, "luatex";
+}
+
 #
 our @AcceptedFallbackDownloaders = qw/curl wget/;
 our %FallbackDownloaderProgram = ( 'wget' => 'wget', 'curl' => 'curl');
@@ -358,6 +369,12 @@
 A list of all those packages which we do not update regularly since they
 are too central, currently texlive.infra and (for Windows) tlperl.win32.
 
+=item C<@TeXLive::TLConfig::InstallExtraRequiredPackages>
+
+A list of packages that are required in addition to those from
+C<@CriticalPackagesList> for the installer to be able to conclude
+installation.
+
 =item C<$TeXLive::TLConfig::RelocTree>
 
 The texmf-tree name that can be relocated, defaults to C<texmf-dist>.