From 91fab1b3c6f690976f73fd5caa1f230966391211 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 5 Mar 2022 22:22:47 +0000 Subject: wording git-svn-id: svn://tug.org/texlive/trunk@62459 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 7 +++--- Master/tlpkg/TeXLive/TLUtils.pm | 21 +++++++++--------- Master/tlpkg/installer/install-menu-text.pl | 33 +++++++++++++++++------------ 3 files changed, 34 insertions(+), 27 deletions(-) (limited to 'Master') diff --git a/Master/install-tl b/Master/install-tl index 5f1cf6896e3..3bbc5d2de20 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -107,11 +107,12 @@ if (($^O !~ /^MSWin/i) && $asked4tcl = 1; $i++; } else { - die "$0: illegal value $q for parameter -gui.\n"; + die "$0: invalid value for parameter -gui: $q\n"; } } } else { - for my $q (qw/in-place profile help print-arch print-platform version no-gui/) { + for my $q (qw/in-place profile help print-arch print-platform + version no-gui/) { if ($p eq "-$q") { # ignore gui mode $want_tcl = 0; @@ -2520,7 +2521,7 @@ sub update_numbers { sub signal_handler { my ($sig) = @_; flushlog(); - print "Caught SIG$sig -- shutting down\n"; + print STDERR "$0: caught SIG$sig -- exiting\n"; exit(1); } diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index da35ab1352d..f251ba66402 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -260,7 +260,7 @@ BEGIN { @EXPORT = qw(setup_programs download_file process_logging_options tldie tlwarn info log debug ddebug dddebug debug debug_hash_str debug_hash - win32 xchdir xsystem run_cmd system_pipe diskfree sort_archs); + win32 xchdir xsystem run_cmd system_pipe sort_archs); } use Cwd; @@ -738,8 +738,9 @@ sub xsystem { Run shell command C<$cmd> and captures its output. Returns a list with CMD's output as the first element and the return value (exit code) as second. -The C<@envvars> - if given - are variable name / value pairs set for the call -and reset to their original value (or unset if not defined initially). +If given, C<@envvars> is a list of environment variable name / value +pairs set in C<%ENV> for the call and reset to their original value (or +unset if not defined initially). =cut @@ -805,10 +806,10 @@ sub system_pipe { =item C -If a POSIX compliant C program is found, returns the number of -Mb free at C<$path>, otherwise C<-1>. If C<$path> is not existent, go -back up to two levels and check if any of the parents exists, and use -the existing one for computing the disk space. +If a POSIX compliant C program is found, returns the number of Mb +free at C<$path>, otherwise C<-1>. If C<$path> does not exist, check +upwards for two levels for an existing parent, and if found, use it for +computing the disk space. =cut @@ -839,9 +840,9 @@ sub diskfree { my ($h,$l) = split(/\n/, $output); my ($fs, $nrb, $used, $avail, @rest) = split(' ', $l); debug("disk space: used=$used (512-block), avail=$avail (512-block)\n"); - # $avail is in 512 blocks, so we need to device by 2 * 1024 to obtain Mb - # require that at least 100M remain free - return (int($avail / 2024)); + # $avail is in 512-byte blocks, so we need to divide by 2*1024 to + # obtain Mb. Require that at least 100M remain free. + return (int($avail / 2048)); } else { # error in running df -P out of whatever reason return (-1); diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index 0c0b1a57199..15385563611 100644 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -1,15 +1,15 @@ #!/usr/bin/env perl # $Id$ -# install-menu-txt.pl # -# Copyright 2007-2021 Norbert Preining, Karl Berry +# Copyright 2007-2022 Norbert Preining, Karl Berry # Copyright 2007-2008 Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 # or any later version. # # This file implements the text based menu system for the TeX Live installer. -use vars qw(@::end_install_hook $::opt_no_cls); +use vars qw(@::end_install_hook + $::opt_no_cls $::opt_select_repository $::run_menu); our %vars; our $opt_in_place; @@ -239,7 +239,7 @@ sub run_menu_text { warn "\n"; warn "Please select a different mirror! See info above.\n"; print STDERR "Press Enter to exit... "; - $ans = readline (*STDIN); + my $ans = readline (*STDIN); exit (1); } @@ -719,7 +719,7 @@ sub help_menu { 'R' => \&main_menu, 'Q' => \&quit ); - my $installer_help="$installerdir/tlpkg/installer/install-tl.html"; + my $installer_help = "notused/tlpkg/installer/install-tl.html"; clear_screen; @@ -963,15 +963,20 @@ sub quit { sub do_install { my $reserve = 100; - if ($vars{'free_size'} > 0 && $vars{'free_size'} + $reserve < $vars{'total_size'}) { - print <<"EOF"; -****************** WARNING *********************** -The required disk space of $vars{'total_size'}M exceeds the available of $vars{'free_size'}M. -Either choose a differernt installation location or reduce the amount -to be installed. - -Press enter to continue! -************************************************** + if ($vars{'free_size'} > 0 + && $vars{'free_size'} + $reserve < $vars{'total_size'}) { + print STDERR <<"EOF"; +*** WARNING ************************************************ +The installation requires $vars{'total_size'}M of disk space +but only $vars{'free_size'}M is available. + +You probably want to clean up the destination filesystem +before continuing here, or else quit (CTRL-C) +and choose a different installation location, +or reduce what gets installed. + +Press Enter to continue the installation anyway. +************************************************ EOF my $ans = readline (*STDIN); main_menu(); -- cgit v1.2.3