From 62f89e102dd4c2db4a58e14c04fa4964ce3dea91 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 20 Jun 2018 01:47:45 +0000 Subject: installer cleanup: add warnings and welcome to log file in text mode git-svn-id: svn://tug.org/texlive/trunk@48056 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Master/install-tl b/Master/install-tl index f8865892616..d82b32581ed 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -588,7 +588,6 @@ install_warnlines_hook(); # collect warnings in @::WARNLINES info("Installing to: $vars{TEXDIR}\n"); $::env_warns = ""; -check_env() unless $ENV{"TEXLIVE_INSTALL_ENV_NOCHECK"}; create_welcome(); my $status = 1; if ($opt_gui eq 'text' or $opt_profile ne "" or @@ -597,11 +596,9 @@ if ($opt_gui eq 'text' or $opt_profile ne "" or if (@::WARNLINES) { foreach my $t (@::WARNLINES) { print STDERR $t; } } - if ($::env_warns) { print STDERR $::env_warns; } + if ($::env_warns) { tlwarn($::env_warns); } unless ($ENV{"TEXLIVE_INSTALL_NO_WELCOME"}) { - foreach my $t (@::welcome_arr) { - print STDOUT "$t\n"; - } + info(join("\n", @::welcome_arr)); } do_cleanup(); # sets $::LOGFILENAME if not already defined if ($LOGFILENAME) { @@ -888,8 +885,12 @@ sub do_installation { # check environment for possibly tex-related strings: check_env() unless $ENV{"TEXLIVE_INSTALL_ENV_NOCHECK"}; + + # We do clean up in the main installation part + # don't do this here because it closes the log file and + # further messages (warnings, welcome) are not logged. # log, profile, temp files: - do_cleanup(); + # do_cleanup(); create_welcome(); if (@::WARNLINES) { -- cgit v1.2.3