From c2697fc286a1e2c94fd9968b76be6f4a6d2114cd Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 11 Apr 2020 03:09:12 +0000 Subject: CTAN sync 202004110309 --- systems/texlive/tlnet/install-tl | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'systems/texlive/tlnet/install-tl') diff --git a/systems/texlive/tlnet/install-tl b/systems/texlive/tlnet/install-tl index c0625f1264..132b49865c 100755 --- a/systems/texlive/tlnet/install-tl +++ b/systems/texlive/tlnet/install-tl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: install-tl 53428 2020-01-16 23:29:27Z karl $ +# $Id: install-tl 54622 2020-04-05 22:33:21Z karl $ # Copyright 2007-2020 # Reinhard Kotucha, Norbert Preining, Karl Berry, Siep Kroonenberg. # This file is licensed under the GNU General Public License version 2 @@ -8,7 +8,7 @@ # Be careful when changing wording: *every* normal informational message # output here must be recognized by the long grep in tl-update-tlnet. -my $svnrev = '$Revision: 53428 $'; +my $svnrev = '$Revision: 54622 $'; $svnrev =~ m/: ([0-9]+) /; $::installerrevision = ($1 ? $1 : 'unknown'); @@ -1205,7 +1205,15 @@ operations might be disturbed.\n\n"; } # now work through the options if specified at all - + my $env_paper = $ENV{"TEXLIVE_INSTALL_PAPER"}; + if (defined $env_paper && $env_paper eq "letter") { + $vars{'instopt_letter'} = 1; + } elsif (defined $env_paper && $env_paper eq "a4") { + ; # do nothing + } elsif ($env_paper) { + tlwarn("$0: TEXLIVE_INSTALL_PAPER value must be letter or a4, not: " + . "$env_paper (ignoring)\n"); + } # letter instead of a4 if ($vars{'instopt_letter'}) { # set paper size, but do not execute any post actions, which in this @@ -2207,7 +2215,9 @@ sub save_options_into_tlpdb { push @archs, "custom"; } if (! @archs) { - tldie("$0: No binary platform specified/available, quitting.\n"); + tldie("$0: Quitting, no binary platform specified/available.\n" + ."$0: See https://tug.org/texlive/custom-bin.html for\n" + ."$0: information on other precompiled binary sets.\n"); } # only if we forced the platform we do save this option into the tlpdb if (defined($opt_force_arch)) { @@ -3153,6 +3163,11 @@ asking about importing previous settings. Omit printing the welcome message after successful installation, e.g., when testing. +=item C + +Set the default paper size for all relevant programs; must be either +C or C. The default is C. + =item C =item C @@ -3188,7 +3203,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: install-tl 53428 2020-01-16 23:29:27Z karl $ +$Id: install-tl 54622 2020-04-05 22:33:21Z karl $ =cut # to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html -- cgit v1.2.3