texlive[62459] Master: wording
commits+karl at tug.org
commits+karl at tug.org
Sat Mar 5 23:22:47 CET 2022
Revision: 62459
http://tug.org/svn/texlive?view=revision&revision=62459
Author: karl
Date: 2022-03-05 23:22:47 +0100 (Sat, 05 Mar 2022)
Log Message:
-----------
wording
Modified Paths:
--------------
trunk/Master/install-tl
trunk/Master/tlpkg/TeXLive/TLUtils.pm
trunk/Master/tlpkg/installer/install-menu-text.pl
Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl 2022-03-05 22:10:37 UTC (rev 62458)
+++ trunk/Master/install-tl 2022-03-05 22:22:47 UTC (rev 62459)
@@ -107,11 +107,12 @@
$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 signal_handler {
my ($sig) = @_;
flushlog();
- print "Caught SIG$sig -- shutting down\n";
+ print STDERR "$0: caught SIG$sig -- exiting\n";
exit(1);
}
Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm 2022-03-05 22:10:37 UTC (rev 62458)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm 2022-03-05 22:22:47 UTC (rev 62459)
@@ -260,7 +260,7 @@
@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 @@
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 @@
=item C<diskfree($path)>
-If a POSIX compliant C<df> 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<df> 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 @@
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);
Modified: trunk/Master/tlpkg/installer/install-menu-text.pl
===================================================================
--- trunk/Master/tlpkg/installer/install-menu-text.pl 2022-03-05 22:10:37 UTC (rev 62458)
+++ trunk/Master/tlpkg/installer/install-menu-text.pl 2022-03-05 22:22:47 UTC (rev 62459)
@@ -1,8 +1,7 @@
#!/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.
@@ -9,7 +8,8 @@
#
# 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 @@
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 @@
'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 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.
+ 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.
-Press enter to continue!
-**************************************************
+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();
More information about the tex-live-commits
mailing list.