diff options
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/install-tl | 10 | ||||
-rwxr-xr-x | Master/tlpkg/installer/install-menu-text.pl | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Master/install-tl b/Master/install-tl index 238919c9e99..0574f527235 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -500,7 +500,9 @@ if ($opt_profile eq "") { # The "make Karl happy" case, check that we are not running install-tl # from the same tree where tlmgr is hanging around my $install_tl_root = abs_path($::installerdir); - my $tlpdboldpath = "$dn/$TeXLive::TLConfig::InfraLocation/$TeXLive::TLConfig::DatabaseName"; + my $tlpdboldpath + = $dn . + "/$TeXLive::TLConfig::InfraLocation/$TeXLive::TLConfig::DatabaseName"; if (-r $tlpdboldpath && $dn ne $install_tl_root) { debug ("found old installation in $dn\n"); push @runargs, "-old-installation-found=$dn"; @@ -2401,9 +2403,9 @@ LWP and persistent connections, use C<--no-persistent-downloads>. =item B<--no-verify-downloads> -By default, if a GnuPG C<gpg> binary is found in the path, downloads are -verified against a cryptographic signature. This option allows to -disable it. +By default, if a GnuPG C<gpg> binary is found in PATH, downloads are +verified against a cryptographic signature. This option disables +such verification. =item B<-portable> diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index dd70436f1b6..586bcbb69ed 100755 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -281,7 +281,7 @@ sub binary_menu { } other_options qw(- + R Q diskspace); - my $answer = prompt 'Enter letter(s) to select platforms'; + my $answer = prompt 'Enter letter(s) to (de)select platforms'; my @keystrokes=string_to_list $answer; @@ -435,7 +435,7 @@ sub collection_menu { ##</cols=1> other_options qw(- + R Q diskspace); - my $answer = prompt 'Enter letter(s) to select collection(s)'; + my $answer = prompt 'Enter letter(s) to (de)select collection(s)'; my @keystrokes=string_to_list $answer; |