diff options
author | Norbert Preining <norbert@preining.info> | 2022-06-15 03:00:50 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-06-15 03:00:50 +0000 |
commit | da68bce1d25d68087ca3b70134a61ae1c3a96b67 (patch) | |
tree | 4d176d7c6b7c9bdbe49b9d24d72b61493ff25dc1 /systems/texlive/tlnet/install-tl | |
parent | 0123ca8e30234615dca0d8853dffec2fb93fe9a8 (diff) |
CTAN sync 202206150300
Diffstat (limited to 'systems/texlive/tlnet/install-tl')
-rwxr-xr-x | systems/texlive/tlnet/install-tl | 54 |
1 files changed, 38 insertions, 16 deletions
diff --git a/systems/texlive/tlnet/install-tl b/systems/texlive/tlnet/install-tl index d5b628913d..cfd8f6c743 100755 --- a/systems/texlive/tlnet/install-tl +++ b/systems/texlive/tlnet/install-tl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: install-tl 63573 2022-06-13 02:55:10Z preining $ +# $Id: install-tl 63586 2022-06-14 01:04:46Z preining $ # Copyright 2007-2022 # Reinhard Kotucha, Norbert Preining, Karl Berry, Siep Kroonenberg. # This file is licensed under the GNU General Public License version 2 @@ -10,7 +10,7 @@ use strict; use warnings; -my $svnrev = '$Revision: 63573 $'; +my $svnrev = '$Revision: 63586 $'; $svnrev =~ m/: ([0-9]+) /; $::installerrevision = ($1 ? $1 : 'unknown'); @@ -292,6 +292,8 @@ my $opt_installation = 1; my $opt_interaction = 1; my $opt_location = ""; my $opt_no_gui = 0; +my $opt_no_doc_install = 0; +my $opt_no_src_install = 0; my $opt_nonadmin = 0; my $opt_paper = ""; my $opt_persistent_downloads = 1; @@ -391,6 +393,8 @@ GetOptions( "location|url|repository|repos|repo=s" => \$opt_location, "no-cls", # $::opt_no_cls in install-menu-text-pl "no-gui" => \$opt_no_gui, + "no-doc-install" => \$opt_no_doc_install, + "no-src-install" => \$opt_no_src_install, "non-admin" => \$opt_nonadmin, "paper=s" => \$opt_paper, "persistent-downloads!" => \$opt_persistent_downloads, @@ -491,13 +495,14 @@ die "$0: Incompatible options: in-place and profile ($opt_profile).\n" die "$0: Incompatible options init-from-profile and in-place.\n" if ($opt_in_place && $opt_init_from_profile); -die "$0: Incompatible options: texuserdir ($opt_texuserdir) and " - . "any of texmfhome, texmfconfig, texmfvar (" - . "$pathopts{'texmfhome'}, $pathopts{'texmfvar'}, $pathopts{'texmfconfig'}" - . ").\n" - if ($opt_texuserdir && - ($pathopts{'texmfhome'} || $pathopts{'texmfvar'} - || $pathopts{'texmfconfig'})); +# We now allow --texuserdir XXX --texmfhome YYYY +# die "$0: Incompatible options: texuserdir ($opt_texuserdir) and " +# . "any of texmfhome, texmfconfig, texmfvar (" +# . "$pathopts{'texmfhome'}, $pathopts{'texmfvar'}, $pathopts{'texmfconfig'}" +# . ").\n" +# if ($opt_texuserdir && +# ($pathopts{'texmfhome'} || $pathopts{'texmfvar'} +# || $pathopts{'texmfconfig'})); if ($#ARGV >= 0) { die "$0: Extra arguments `@ARGV'; try --help if you need it.\n"; @@ -936,6 +941,7 @@ sub final_remote_init { update_default_scheme(); update_default_paper(); + update_default_src_doc_install(); } # final_remote_init sub update_default_scheme { @@ -977,6 +983,16 @@ sub update_default_paper { } } # update_default_paper +sub update_default_src_doc_install { + if ($opt_no_src_install) { + $vars{'tlpdbopt_install_srcfiles'} = 0; + } + if ($opt_no_doc_install) { + $vars{'tlpdbopt_install_docfiles'} = 0; + } +} # update_default_src_doc_install + + sub do_installation { if (win32()) { @@ -1699,13 +1715,12 @@ sub set_texlive_default_dirs { my $homedir = (platform() =~ m/darwin/) ? "~/Library" : "~"; my $yyyy = $TeXLive::TLConfig::ReleaseYear; # - # We already checked that either $opt_texuserdir xor at least one of the - # directory options (texmfhome, texmfvar, texmfconfig) is set. In case - # $opt_texuserdir is set, assign the respective values to texmfhome etc. + # If the --texuserdir is given, assign values to texmfhome/var/config + # unless the separate cmd line options are also present. if ($opt_texuserdir) { - $pathopts{'texmfhome'} = "$opt_texuserdir/texmf"; - $pathopts{'texmfvar'} = "$opt_texuserdir/texmf-var"; - $pathopts{'texmfconfig'} = "$opt_texuserdir/texmf-config"; + $pathopts{'texmfhome'} = "$opt_texuserdir/texmf" if (!$pathopts{'texmfhome'}); + $pathopts{'texmfvar'} = "$opt_texuserdir/texmf-var" if (!$pathopts{'texmfvar'}); + $pathopts{'texmfconfig'} = "$opt_texuserdir/texmf-config" if (!$pathopts{'texmfconfig'}); } # # Sources of target directory settings in priority order: @@ -3076,6 +3091,13 @@ anyway, with the idea that it was a transient network problem and reinstallation will succeed later. If this option is specified, and the retry fails, the installer aborts. +=item B<-no-doc-install> + +=item B<-no-src-install> + +Do not install source/doc files and set the options to not install source/doc +files in the saved database. + =item B<-no-installation> Do not perform any installation. This is for debugging the @@ -3442,7 +3464,7 @@ This script and its documentation were written for the TeX Live distribution (L<https://tug.org/texlive>) and both are licensed under the GNU General Public License Version 2 or later. -$Id: install-tl 63573 2022-06-13 02:55:10Z preining $ +$Id: install-tl 63586 2022-06-14 01:04:46Z preining $ =cut # to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html |