From 5b6d00a6ba4e9c36af0332f236ce06f7fe2d4c86 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 3 Sep 2018 17:46:06 +0000 Subject: doc, wording git-svn-id: svn://tug.org/texlive/trunk@48560 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'Master/install-tl') diff --git a/Master/install-tl b/Master/install-tl index 7657e1e8dad..cee1bad9d3d 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -972,6 +972,7 @@ sub run_postinst_cmd { # Make texmf.cnf, backup directory, cleanups, path setting, and # (most importantly) post-install subprograms: mktexlsr, fmtutil, # and more. Return count of errors detected, hopefully zero. +# sub do_postinst_stuff { my $TEXDIR = "$vars{'TEXDIR'}"; my $TEXMFSYSVAR = "$vars{'TEXMFSYSVAR'}"; @@ -1472,10 +1473,10 @@ sub set_standard_var { # via env var my $envvar = getenv($envstr); if ($vars{$what} && $envvar && $vars{$what} ne $envvar) { - tlwarn("Trying to define $what via conflicting settings\n"); - tlwarn(" from profile: " . $vars{$what} . "\n"); - tlwarn(" from envvar: $envvar ($envstr)\n"); - tlwarn("Preferring the profile variable!\n"); + tlwarn("Trying to define $what via conflicting settings:\n"); + tlwarn(" from envvar $envvar = $envvar($envstr)\n"); + tlwarn(" from profile = $vars{$what}\n"); + tlwarn(" Preferring the profile value!\n"); $envvar = undef; } # default for most variables is in increasing priority @@ -1496,10 +1497,10 @@ sub set_texlive_default_dirs { if ($tlprefixenv && $vars{'TEXDIR'}) { # NOTE we cannot compare these two values because the one might # contain the YYYY part (TEXDIR) while the other is the one without. - tlwarn("Trying to setup basic path using two incompatible methods\n"); - tlwarn(" from profile: " . $vars{'TEXDIR'} . "\n"); - tlwarn(" from envvar: $tlprefixenv ('TEXLIVE_INSTALL_PREFIX')\n"); - tlwarn("Preferring the profile variable!\n"); + tlwarn("Trying to set up basic path using two incompatible methods:\n"); + tlwarn(" from envvar TEXLIVE_INSTALL_PREFIX = $tlprefixenv\n"); + tlwarn(" from profile TEXDIR = $vars{'TEXDIR'}\n"); + tlwarn(" Preferring the profile value!\n"); $tlprefixenv = undef; } # first set $tex_prefix @@ -2738,9 +2739,9 @@ installer interfaces. USE AT YOUR OWN RISK. =item B<-init-from-profile> I -Similar to B<-profile> (see L below), but only initializes the -installation configuration from I and then starts the -interactive session. +Similar to B<-profile> (see L below), but only initializes +the installation configuration from I and then starts a +normal interactive session. Environment variables are not ignored. =item B<-logfile> I @@ -2797,7 +2798,8 @@ C<-print-arch> is a synonym. =item B<-profile> I Load I and do the installation with no user interaction, -that is, a batch (unattended) install. See L below. +that is, a batch (unattended) install. Environment variables are +ignored. See L below. =item B<-q> -- cgit v1.2.3