From e2e61931409be2a7142b4d0f4b59a275b7f59e2a Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 2 Feb 2021 03:04:35 +0000 Subject: CTAN sync 202102020304 --- .../texlive/tlnet/tlpkg/installer/install-menu-text.pl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl') diff --git a/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl b/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl index d5db0f45c5..42de357b4f 100644 --- a/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl +++ b/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: install-menu-text.pl 53428 2020-01-16 23:29:27Z karl $ +# $Id: install-menu-text.pl 57583 2021-01-31 22:46:51Z karl $ # install-menu-txt.pl # # Copyright 2007-2020 Norbert Preining, Karl Berry @@ -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 = ); - 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 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 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"}) { -- cgit v1.2.3