From 13a044b932f3f8d72791ca88eda528bdcbadcacc Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 19 Oct 2019 03:01:18 +0000 Subject: CTAN sync 201910190301 --- systems/texlive/tlnet/install-tl | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'systems/texlive/tlnet/install-tl') diff --git a/systems/texlive/tlnet/install-tl b/systems/texlive/tlnet/install-tl index 74be0fd1b9..fe28bd0e58 100755 --- a/systems/texlive/tlnet/install-tl +++ b/systems/texlive/tlnet/install-tl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: install-tl 52423 2019-10-17 22:32:30Z karl $ +# $Id: install-tl 52435 2019-10-18 22:03:53Z karl $ # Copyright 2007-2019 # 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: 52423 $'; +my $svnrev = '$Revision: 52435 $'; $svnrev =~ m/: ([0-9]+) /; $::installerrevision = ($1 ? $1 : 'unknown'); @@ -452,12 +452,12 @@ if (defined($::opt_lang)) { } if ($opt_profile) { # for now, not allowed if in_place - if (-r $opt_profile) { + if (-r $opt_profile && -f $opt_profile) { info("Automated TeX Live installation using profile: $opt_profile\n"); } else { $opt_profile = ""; info( - "Profile $opt_profile not readable, continuing in interactive mode.\n"); +"Profile $opt_profile not readable or not a file, continuing in interactive mode.\n"); } } @@ -2150,19 +2150,23 @@ sub do_install_packages { $localtlpdb->option ("file_assocs", "0"); $localtlpdb->option ("post_code", "0"); if (!install_packages($tlpdb,$media,$localtlpdb,\@what, - $vars{'tlpdbopt_install_srcfiles'},$vars{'tlpdbopt_install_docfiles'})) { + $vars{'tlpdbopt_install_srcfiles'}, + $vars{'tlpdbopt_install_docfiles'})) { my $profile_name = "installation.profile"; create_profile($profile_name); tlwarn("Installation failed.\n"); tlwarn("Rerunning the installer will try to restart the installation.\n"); - tlwarn("Or you can restart by running the installer with:\n"); - my $repostr = ($opt_location ? " --repository $location" : ""); - if (win32()) { - tlwarn(" install-tl-windows.bat$repostr --profile $profile_name [EXTRA-ARGS]\n" - ."or\n" - ." install-tl-advanced.bat$repostr --profile $profile_name [EXTRA-ARGS]\n"); - } else { - tlwarn(" install-tl$repostr --profile $profile_name [EXTRA-ARGS]\n"); + if (-r $profile_name) { + # only suggest rerunning with the profile if it exists. + tlwarn("Or you can restart by running the installer with:\n"); + my $repostr = ($opt_location ? " --repository $location" : ""); + if (win32()) { + tlwarn(" install-tl-windows.bat$repostr --profile $profile_name [EXTRA-ARGS]\n" + ."or\n" + ." install-tl-advanced.bat$repostr --profile $profile_name [EXTRA-ARGS]\n"); + } else { + tlwarn(" install-tl$repostr --profile $profile_name [EXTRA-ARGS]\n"); + } } flushlog(); exit(1); @@ -3179,7 +3183,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 52423 2019-10-17 22:32:30Z karl $ +$Id: install-tl 52435 2019-10-18 22:03:53Z karl $ =cut # to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html -- cgit v1.2.3