summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer/install-menu-text.pl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-20 00:28:11 +0000
committerKarl Berry <karl@freefriends.org>2010-09-20 00:28:11 +0000
commit7446b088cc3846a3b910919bc9189e40ddbde6b2 (patch)
tree3717277549d1e866e57d9702dddbf77ec3f794cc /Master/tlpkg/installer/install-menu-text.pl
parentc16c3671b463389088bf967cb266e97f3329f819 (diff)
Don't give spurious "unknown command" msgs when
selecting collections or languages. Use "platform" terminology consistently. Make wording of prompts and menu_head's more consistent. git-svn-id: svn://tug.org/texlive/trunk@19816 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-text.pl')
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl33
1 files changed, 17 insertions, 16 deletions
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 79485f8dc52..31ad9baab63 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -97,7 +97,7 @@ sub other_options {
}
sub prompt {
- my $prompt=shift;
+ my $prompt = shift;
print "\n$prompt: ";
my $answer = <STDIN>;
$answer = "q" if !defined($answer);
@@ -148,7 +148,7 @@ sub binary_menu {
my %keyval;
my $selected_platform;
- menu_head "Available sets of binaries:";
+ menu_head "Available platforms:";
foreach my $key (keys %vars) {
if ($key =~ /binary_(.*)/) {
@@ -167,7 +167,7 @@ sub binary_menu {
}
other_options qw(- + R Q diskspace);
- my $answer=prompt 'Press key to select/deselect binary systems';
+ my $answer = prompt 'Enter letter(s) to select platforms';
my @keystrokes=string_to_list $answer;
@@ -213,7 +213,7 @@ sub scheme_menu {
my %keyval;
my $index=0;
- menu_head 'Select a scheme:';
+ menu_head 'Select scheme:';
foreach my $pkg ($tlpdb->schemes) {
push @schemes, $pkg;
@@ -244,7 +244,7 @@ sub scheme_menu {
}
other_options qw(R Q diskspace);
- my $answer=prompt 'Press key to select a scheme';
+ my $answer = prompt 'Enter letter to select scheme';
if (defined $keyval{"$answer"}) {
$vars{'selected_scheme'}=$keyval{"$answer"};
@@ -322,7 +322,7 @@ sub collection_menu {
##</cols=1>
other_options qw(- + R Q diskspace);
- my $answer=prompt 'Press key to select collections';
+ my $answer = prompt 'Enter letter(s) to select collection(s)';
my @keystrokes=string_to_list $answer;
@@ -339,13 +339,14 @@ sub collection_menu {
}
if (defined $keyval{$keystroke}) {
toggle "$keyval{$keystroke}";
+ } elsif (!defined $command{"\u$answer"}) {
+ print "Unknown command: $keystroke\n\n";
}
}
if (defined $command{"\u$answer"}) {
return $command{"\u$answer"}->();
} else {
- print "Unknown command: $answer\n\n";
return $command{'self'}->();
}
}
@@ -366,7 +367,7 @@ sub language_menu {
my $lang_doc_index=0;
my $lines;
- menu_head 'Select language support:';
+ menu_head 'Language support:';
@languages=sort @collections_lang;
@lang_docs=sort @collections_lang_doc;
@@ -390,7 +391,7 @@ sub language_menu {
}
}
- print "\nSelect language-specific documentation:\n\n";
+ print "\nLanguage-specific documentation:\n\n";
$lines=@lang_docs/2;
++$lines if (@lang_docs%2);
@@ -412,7 +413,7 @@ sub language_menu {
}
other_options qw (+ - R Q diskspace);
- my $answer=prompt 'Press key to select language';
+ my $answer = prompt 'Enter letter(s) to select language(s)';
my @keystrokes=string_to_list $answer;
@@ -429,17 +430,17 @@ sub language_menu {
}
if (defined $keyval{$keystroke}) {
toggle "$keyval{$keystroke}";
+ } elsif (!defined $command{"\u$answer"}) {
+ print "Unknown command: $keystroke\n\n";
}
}
if (defined $keyval{"$answer"}) {
- # $vars{'selected_scheme'}=$keyval{"$answer"};
return $command{'self'}->();
}
if (defined $command{"\u$answer"}) {
return $command{"\u$answer"}->();
} else {
- print "Unknown command: $answer\n\n";
return $command{'self'}->();
}
}
@@ -455,7 +456,7 @@ sub directories_menu
my $maindir = $vars{'from_dvd'} ? 'TEXDIRW' : 'TEXDIR';
- menu_head "Current directories setup:";
+ menu_head "Directories setup:";
if (!TeXLive::TLUtils::texdir_check($vars{$maindir})) {
print "!! The default location as given below can't be written to.
!! Either change the destination directory using <1> or create it
@@ -730,7 +731,7 @@ sub options_menu {
);
clear_screen;
- menu_head "Current options setup:";
+ menu_head "Options setup:";
print <<"EOF";
<P> use letter size instead of A4 by default: $b_letter
@@ -949,7 +950,7 @@ EOF
print <<"EOF";
Detected platform: $this_platform
$warn_nobin
- <B> binary systems: $vars{'n_systems_selected'} out of $vars{'n_systems_available'}
+ <B> platforms: $vars{'n_systems_selected'} out of $vars{'n_systems_available'}
<S> installation scheme ($vars{'selected_scheme'})
$vars{'n_collections_selected'} collections out of $vars{'n_collections_available'}, disk space required: $vars{'total_size'} MB
@@ -1034,7 +1035,7 @@ EOF
}
other_options qw(I H Q);
- my $answer=prompt 'Enter command';
+ my $answer = prompt 'Enter command';
if (defined $command{"\u$answer"}) {
return $command{"\u$answer"};