diff options
author | Norbert Preining <preining@logic.at> | 2022-02-17 00:39:03 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2022-02-17 00:39:03 +0000 |
commit | 2d1413ce2775121fd11fbf285ab36a9f60ef0369 (patch) | |
tree | ed4b9bd7c3b8dcb0401e3cc1849870e1e04a56e8 | |
parent | d8f873973727c80b845fa9ced1cc311bcc04d985 (diff) |
resilient installation: move list of extra install packages to TLConfig
git-svn-id: svn://tug.org/texlive/trunk@62052 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Master/install-tl | 6 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLConfig.pm | 17 |
2 files changed, 18 insertions, 5 deletions
diff --git a/Master/install-tl b/Master/install-tl index 8c36c2d4fa3..09ddf2514ec 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -2143,11 +2143,7 @@ sub do_install_packages { # 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); diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index 5da9b4a4f42..ceca57655ff 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -41,6 +41,7 @@ BEGIN { $TeXLiveURL @CriticalPackagesList $CriticalPackagesRegexp + @InstallExtraRequiredPackages $WindowsMainMenuName $RelocPrefix $RelocTree @@ -122,6 +123,16 @@ if ($^O =~ /^MSWin/i) { $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 @@ C<systems/texlive/tlnet/>. 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>. |