From ab342cfe61fae10fe174f02a056511cd80424a1a Mon Sep 17 00:00:00 2001 From: Reinhard Kotucha Date: Sun, 5 Oct 2008 04:03:26 +0000 Subject: install-menu-text.pl: show required diskspace immediately in submenus. git-svn-id: svn://tug.org/texlive/trunk@10858 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/installer/install-menu-text.pl | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'Master') diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index 59eac9f733c..68fc8071d8f 100755 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -77,7 +77,15 @@ sub other_options { $opts{'I'}='start installation to hard disk'; } - print "\nOther actions:\n"; + if ($options[$#options] eq 'diskspace') { + pop @options; + calc_depends; + print "\nOther actions: ". + "Disk space required: $vars{'total_size'} MB\n"; + } else { + print "\nOther actions:\n"; + } + for my $option (@options) { if (defined $opts{"$option"}) { printf " <%s> %s\n", $option, $opts{$option}; @@ -137,7 +145,7 @@ sub binary_menu { $keyval{"$keys[$index]"} = "binary_$binary"; ++$index; } - other_options qw(- + R Q); + other_options qw(- + R Q diskspace); my $answer=prompt 'Press key to select/deselect binary systems'; @@ -224,7 +232,7 @@ sub scheme_menu { $vars{"collection-wintools"} = 0; } - other_options qw(R Q); + other_options qw(R Q diskspace); my $answer=prompt 'Press key to select a scheme'; if (defined $keyval{"$answer"}) { @@ -301,7 +309,7 @@ sub collection_menu { } ## - other_options qw(- + R Q); + other_options qw(- + R Q diskspace); my $answer=prompt 'Press key to select collections'; my @keystrokes=string_to_list $answer; @@ -391,7 +399,7 @@ sub language_menu { } } - other_options qw (+ - R Q); + other_options qw (+ - R Q diskspace); my $answer=prompt 'Press key to select language'; my @keystrokes=string_to_list $answer; @@ -627,8 +635,8 @@ sub help_menu { ++$line; } print "\n", hbar, - " top next page

previous page return" - . " --", $vars{'page'}+1, "--\n"; + " top next page

previous page return" + . " quit --", $vars{'page'}+1, "--\n"; my $answer = prompt 'Enter command'; @@ -698,7 +706,7 @@ EOF EOF ; } - other_options qw(R Q); + other_options qw(R Q diskspace); my $answer = prompt 'Enter command'; if (unix) { -- cgit v1.2.3