summaryrefslogtreecommitdiff
path: root/systems/texlive/tlnet/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-05-15 03:02:03 +0000
committerNorbert Preining <norbert@preining.info>2020-05-15 03:02:03 +0000
commit2cf53968f130744e9fe88bef59c11d80218cbb45 (patch)
tree52bbd7b05edea171c66c35bd439ef8f64d8eee8b /systems/texlive/tlnet/install-tl
parenta50631c54fcd57d69c71325208f42b3da94d98a1 (diff)
CTAN sync 202005150302
Diffstat (limited to 'systems/texlive/tlnet/install-tl')
-rwxr-xr-xsystems/texlive/tlnet/install-tl12
1 files changed, 6 insertions, 6 deletions
diff --git a/systems/texlive/tlnet/install-tl b/systems/texlive/tlnet/install-tl
index ebd57956a7..ff70ef3241 100755
--- a/systems/texlive/tlnet/install-tl
+++ b/systems/texlive/tlnet/install-tl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: install-tl 54993 2020-05-03 21:57:54Z karl $
+# $Id: install-tl 55126 2020-05-13 17:27:10Z 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: 54993 $';
+my $svnrev = '$Revision: 55126 $';
$svnrev =~ m/: ([0-9]+) /;
$::installerrevision = ($1 ? $1 : 'unknown');
@@ -319,7 +319,7 @@ if ((defined $ARGV[0]) && $ARGV[0] eq "-from_ext_gui") {
# continue with the installation
# note, we are in the directory from which the aborted installation was run.
my %profiledata;
-if (-r "installation.profile") {
+if (-r "installation.profile" && !exists $ENV{"TEXLIVE_INSTALL_NO_RESUME"}) {
if ($from_ext_gui) { # prepare for dialog interaction
print "mess_yesno\n";
}
@@ -386,7 +386,7 @@ if ($opt_help) {
@noperldoc = ("-noperldoc", "1");
}
- # Tweak less stuff same as tlmgr, though.
+ # Tweak less invocation same as tlmgr, though.
# less can break control characters and thus the output of pod2usage
# is broken. We add/set LESS=-R in the environment and unset
# LESSPIPE and LESSOPEN to try to help.
@@ -3154,7 +3154,7 @@ variables.
Omit creating the ConTeXt cache. This is useful for redistributors.
-=item C<TEXLIVE_INSTALL_NO_IMPORT>
+=item C<TEXLIVE_INSTALL_NO_RESUME>
Omit check for installing on top of a previous installation and then
asking about importing previous settings.
@@ -3204,7 +3204,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 54993 2020-05-03 21:57:54Z karl $
+$Id: install-tl 55126 2020-05-13 17:27:10Z karl $
=cut
# to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html