From bf393e635d1fb55b009da7ade3001c104c7deb48 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 3 May 2021 03:00:43 +0000 Subject: CTAN sync 202105030300 --- systems/texlive/tlnet/install-tl | 45 ++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 25 deletions(-) (limited to 'systems/texlive/tlnet/install-tl') diff --git a/systems/texlive/tlnet/install-tl b/systems/texlive/tlnet/install-tl index 5d0a7667d0..80b9985a15 100755 --- a/systems/texlive/tlnet/install-tl +++ b/systems/texlive/tlnet/install-tl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: install-tl 58938 2021-04-21 21:26:24Z karl $ +# $Id: install-tl 59056 2021-05-02 21:48:01Z karl $ # Copyright 2007-2021 # 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: 58938 $'; +my $svnrev = '$Revision: 59056 $'; $svnrev =~ m/: ([0-9]+) /; $::installerrevision = ($1 ? $1 : 'unknown'); @@ -1227,8 +1227,10 @@ operations might be disturbed.\n\n"; $errcount += run_postinst_cmd( "fmtutil-sys $common_fmtutil_args --no-strict --all"); } else { - info("not running fmtutil-sys (not installed)\n"); + info("not running fmtutil-sys (script not installed)\n"); } + } else { + info("not running fmtutil-sys (user option create_formats=0)\n"); } # do path adjustments: On Windows add/remove to PATH etc, @@ -2308,30 +2310,23 @@ sub import_settings_from_old_tlpdb { # # now for the settings # set the defaults to what is specified in the tlpdb - $vars{'tlpdbopt_install_docfiles'} = - $previoustlpdb->option_pkg("00texlive.installation", - "install_docfiles"); - $vars{'tlpdbopt_install_srcfiles'} = - $previoustlpdb->option_pkg("00texlive.installation", - "install_srcfiles"); - $vars{'tlpdbopt_create_formats'} = - $previoustlpdb->option_pkg("00texlive.installation", - "create_formats"); + $vars{'tlpdbopt_install_docfiles'} + = $previoustlpdb->option_pkg("00texlive.installation", "install_docfiles"); + $vars{'tlpdbopt_install_srcfiles'} + = $previoustlpdb->option_pkg("00texlive.installation", "install_srcfiles"); + $vars{'tlpdbopt_create_formats'} + = $previoustlpdb->option_pkg("00texlive.installation", "create_formats"); $vars{'tlpdbopt_desktop_integration'} = 1 if win32(); - $vars{'instopt_adjustpath'} = - $previoustlpdb->option_pkg("00texlive.installation", - "path"); + $vars{'instopt_adjustpath'} + = $previoustlpdb->option_pkg("00texlive.installation", "path"); $vars{'instopt_adjustpath'} = 0 if !defined($vars{'instopt_adjustpath'}); $vars{'instopt_adjustpath'} = 1 if win32(); - $vars{'tlpdbopt_sys_bin'} = - $previoustlpdb->option_pkg("00texlive.installation", - "sys_bin"); - $vars{'tlpdbopt_sys_man'} = - $previoustlpdb->option_pkg("00texlive.installation", - "sys_man"); - $vars{'sys_info'} = - $previoustlpdb->option_pkg("00texlive.installation", - "sys_info"); + $vars{'tlpdbopt_sys_bin'} + = $previoustlpdb->option_pkg("00texlive.installation", "sys_bin"); + $vars{'tlpdbopt_sys_man'} + = $previoustlpdb->option_pkg("00texlive.installation", "sys_man"); + $vars{'sys_info'} + = $previoustlpdb->option_pkg("00texlive.installation", "sys_info"); # # import the set of selected architectures my @aar = $previoustlpdb->setting_pkg("00texlive.installation", @@ -3116,7 +3111,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 58938 2021-04-21 21:26:24Z karl $ +$Id: install-tl 59056 2021-05-02 21:48:01Z karl $ =cut # to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html -- cgit v1.2.3