diff options
| author | Karl Berry <karl@freefriends.org> | 2021-01-31 22:46:51 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-01-31 22:46:51 +0000 |
| commit | 5ef4dec11d2c1029a902b9dd6580b8cb69677f81 (patch) | |
| tree | 7ec613fe8b97cecefe6aac55c0ee9c3a818df0e0 /Master | |
| parent | 57566c51d37de513afe8e7efe9949f64d22a3e02 (diff) | |
(other_options) <opts>: no more H(elp), hasn't
worked for years.
(main_menu): likewise, and change call. Print out
the doc url in the beginning header.
(run_menu_text): wording of using existing TL;
check for undefined $yn (e.g., install-tl </dev/null).
git-svn-id: svn://tug.org/texlive/trunk@57583 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/tlpkg/installer/install-menu-text.pl | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index a31ab8819df..006ee03aded 100644 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -96,7 +96,6 @@ sub other_options { my %opts=( '-' => 'deselect all', '+' => 'select all', - 'H' => 'help', 'R' => 'return to main menu', 'P' => 'save installation profile to \'texlive.profile\' and exit', 'Q' => 'quit' @@ -253,14 +252,14 @@ sub run_menu_text { my $f = shift @args; if ($f =~ m/^-old-installation-found=(.*)$/) { my $dn = $1; - print "\nAn old installation of TeX Live has been found in $dn\n"; + print "\nAn existing installation of TeX Live has been found in $dn\n"; print " -If you want the selection of schemes/collections and various options being -taken over press `y', otherwise anything else. +If you want its selection of schemes/collections and various options +to be used, press `y', otherwise anything else. Import settings from previous TeX Live installation: (y/n): "; chomp(my $yn = <STDIN>); - if ($yn =~ m/^y$/i) { + if (defined $yn && $yn =~ m/^y$/i) { import_settings_from_old_tlpdb($dn); } } @@ -710,6 +709,9 @@ sub html2text { } +# dumping the html doc to stdout does not seem very helpful, +# and did not work for years with no one noticing, so this +# function is no longer used. sub help_menu { my %command=( 'self' => \&help_menu, @@ -1023,7 +1025,6 @@ sub main_menu { my %command = ( 'self' => \&main_menu, 'D' => \&directories_menu, - 'H' => \&help_menu, 'I' => \&do_install, 'O' => \&options_menu, 'Q' => \&quit, @@ -1042,6 +1043,7 @@ sub main_menu { ======> Letters/digits in <angle brackets> indicate <======= ======> menu items for actions or customizations <======= += help> https://tug.org/texlive/doc/install-tl.html <======= Detected platform: $this_platform $warn_nobin @@ -1130,7 +1132,7 @@ EOF print "\n <V> set up for portable installation\n"; } - other_options qw(I P H Q); + other_options qw(I P Q); my $answer = prompt 'Enter command'; if (defined $command{"\u$answer"}) { |