From 334f50bebe36198db1bb08037ae5aa0312c84099 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Sat, 10 Jul 2010 21:40:26 +0000 Subject: Show a summary of warnings in final message of the installer. git-svn-id: svn://tug.org/texlive/trunk@19356 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/installer/install-menu-perltk.pl | 7 ++++++- Master/tlpkg/installer/install-menu-wizard.pl | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'Master/tlpkg/installer') diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 9a1890ca421..b238fc27981 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -106,7 +106,6 @@ sub setup_hooks_perltk { update_status(join(" ",@_)); $mainwindow->update; }; - @::warn_hook = (); push @::warn_hook, sub { return unless defined $mainwindow ; @@ -385,6 +384,12 @@ sub installation_window { if (!win32()) { $t .= "\n\n" . __("Add %s/texmf/doc/man to MANPATH.\nAdd %s/texmf/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions.", $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'this_platform'}); } + if (@::WARNLINES) { + $t .= "\n\n" . __("There were some warnings during the installation process.\nHere is a summary of warning messages:") . "\n"; + $t .= join('', @::WARNLINES); + $t =~ s/\n\z//; + } + $t .= "\n\n" . __("Welcome to TeX Live!"); #$t =~ s/\\n/\n/g; $::progressw->insert("end", "\n"); diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index b38e52a4897..7b7a2c6836a 100644 --- a/Master/tlpkg/installer/install-menu-wizard.pl +++ b/Master/tlpkg/installer/install-menu-wizard.pl @@ -105,7 +105,6 @@ sub setup_hooks_wizard { wizard_update_status(join(" ",@_)); $mw->update; }; - @::warn_hook = (); push @::warn_hook, sub { return unless defined($mw); @@ -499,6 +498,11 @@ sub wizard_installation_window { if (!win32()) { $t .= "\n\n" . __("Add %s/texmf/doc/man to MANPATH.\nAdd %s/texmf/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions.", $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'this_platform'}); } + if (@::WARNLINES) { + $t .= "\n\n" . __("There were some warnings during the installation process.\nHere is a summary of warning messages:") . "\n"; + $t .= join('', @::WARNLINES); + $t =~ s/\n\z//; + } $t .= "\n\n" . __('Welcome to TeX Live!'); #$t =~ s/\\n/\n/g; my $linechar = $::progressw->index("end"); -- cgit v1.2.3