summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer/install-menu-text.pl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-05-11 16:14:33 +0000
committerKarl Berry <karl@freefriends.org>2013-05-11 16:14:33 +0000
commit7033bbab7d1e6ece677121219fae978a79d2196b (patch)
treeb01701c136ca26d132f69dbcaead46a95f3164a2 /Master/tlpkg/installer/install-menu-text.pl
parentac93d0106be1df6cc3cd1bfb0101ef7db97a2706 (diff)
merge language menu into regular collections menu
git-svn-id: svn://tug.org/texlive/trunk@30398 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-text.pl')
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl90
1 files changed, 6 insertions, 84 deletions
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index e963add563d..11f76ad8f5c 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -17,7 +17,6 @@ our @media_available;
our $media;
our $previoustlpdb;
our @collections_std;
-our @collections_lang;
our $texlive_release;
my $MENU_CONTINUE = -1;
@@ -464,76 +463,6 @@ sub collection_menu {
}
}
-sub language_menu {
- my %command=(
- 'self' => \&language_menu,
- 'R' => \&main_menu,
- 'Q' => \&quit
- );
-
- my @languages;
- my @lang_keys=string_to_list "abcdefghijklmnopstuvwxyz0123456789";
- my %keyval;
- my $lang_index=0;
- my $lines;
-
- menu_head 'Language support:';
-
- @languages=sort @collections_lang;
-
- $lines=@languages/2;
- ++$lines if (@languages%2);
- for my $index (0..$lines-1) {
- my $language=$languages[$index];
- my $tlpobj = $tlpdb->get_package("$language");
- $keyval{$lang_keys[$index]}="$language";
- printf " %s %s %-33s", $lang_keys[$index], button($vars{"$language"}),
- substr($tlpobj->shortdesc,0,33);
- if (defined $languages[$index+$lines]) {
- my $language=$languages[$index+$lines];
- my $tlpobj = $tlpdb->get_package("$language");
- $keyval{$lang_keys[$index+$lines]}="$language";
- printf " %s %s %-32s\n", $lang_keys[$index+$lines],
- button($vars{"$language"}), substr($tlpobj->shortdesc,0,32);
- } else {
- print "\n";
- }
- }
-
- other_options qw (+ - R Q diskspace);
- my $answer = prompt 'Enter letter(s) to select language(s)';
-
- my @keystrokes=string_to_list $answer;
-
- foreach my $keystroke (@keystrokes) {
- if ($keystroke eq '-') {
- for my $collection (@languages) {
- $vars{"$collection"}=0 if defined $vars{"$collection"};
- }
- }
- if ($keystroke eq '+') {
- for my $collection (@languages) {
- $vars{"$collection"}=1 if defined $vars{"$collection"};
- }
- }
- if (defined $keyval{$keystroke}) {
- toggle "$keyval{$keystroke}";
- } elsif (!defined $command{"\u$answer"}) {
- print "Unknown command: $keystroke\n\n";
- }
- }
-
- if (defined $keyval{"$answer"}) {
- return $command{'self'}->();
- }
- if (defined $command{"\u$answer"}) {
- select_scheme("scheme-custom");
- return $command{"\u$answer"}->();
- } else {
- return $command{'self'}->();
- }
-}
-
sub directories_menu
{
@@ -1053,7 +982,6 @@ sub main_menu {
if (!$vars{'in_place'}) {
$command{'B'} = \&binary_menu if unix();
$command{'C'} = \&collection_menu;
- $command{'L'} = \&language_menu;
$command{'S'} = \&scheme_menu;
}
@@ -1061,8 +989,8 @@ sub main_menu {
print <<"EOF";
======================> TeX Live installation procedure <=====================
-=======> Note: Letters/digits in <angle brackets> indicate menu items <=======
-=======> for commands or configurable options <=======
+======> Letters/digits in <angle brackets> indicate <=======
+======> menu items for commands or options <=======
Detected platform: $this_platform
$warn_nobin
@@ -1070,20 +998,14 @@ EOF
if (!$vars{'in_place'}) {
print <<"EOF";
- <B> platforms: $vars{'n_systems_selected'} out of $vars{'n_systems_available'}
+ <B> binary 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
+ <S> set installation scheme ($vars{'selected_scheme'})
- Customizing installation scheme:
- <C> standard collections
- <L> language collections
+ <C> customizing installation collections
+ $vars{'n_collections_selected'} collections out of $vars{'n_collections_available'}, disk space required: $vars{'total_size'} MB
EOF
- if (!check_on_lang_collection_installed()) {
- print " !! No language specific collection selected!\n";
- print " !! If you only write American English documents that is fine!\n";
- }
}
if ($portable_toggled) {
print $ptoggle_alert;