by default allow only ftp mirrors, and try mirror.ctan.org 5 times

for a proper mirror. If then there is still no success, fall back to
one of the backbone nodes.
Add support for command line option -allow-ftp in install-tl and tlmgr
all support for setting allow-ftp = 1 permanently in tlmgr config file


git-svn-id: svn://tug.org/texlive/trunk@18431 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 12 insertions, 3 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 4c21bbea15f..9efa22d2868 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -159,6 +159,7 @@ my $opt_custom_bin;
 my $opt_version = 0;
 my $opt_force_arch;
 my $opt_persistent_downloads = 1;
+my $opt_allow_ftp = 0;
 
 # show all options even those not relevant for that arch
 $::opt_all_options = 0;
@@ -213,6 +214,7 @@ GetOptions(
            "scheme=s"       => \$opt_scheme,
            "all-options"    => \$::opt_all_options,
            "persistent-downloads!"      => \$opt_persistent_downloads,
+           "allow-ftp!"     => \$opt_allow_ftp,
            "version"        => \$opt_version,
            "help|?"         => \$opt_help) or pod2usage(1);
 
@@ -373,9 +375,9 @@ $location || ($location = "$::installerdir");
 if ($location =~ m!^(ctan$|(http|ftp)://)!i) {
   $location =~ s,/(tlpkg|archive)?/*$,,;  # remove any trailing tlpkg or /
   if ($location =~ m/^ctan$/i) {
-    $location = TeXLive::TLUtils::give_ctan_mirror();
+    $location = TeXLive::TLUtils::give_ctan_mirror('-allow-ftp' => $opt_allow_ftp);
   } elsif ($location =~ m/^$TeXLiveServerURL/) {
-    my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base();
+    my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base('-allow-ftp' => $opt_allow_ftp);
     $location =~ s,^($TeXLiveServerURL|ctan$),$mirrorbase,;
   }
   $TeXLiveURL = $location;
@@ -405,7 +407,7 @@ if ($location =~ m!^(ctan$|(http|ftp)://)!i) {
       die "$0: cannot find installation source at $opt_location.\n";
     }
     # no --location given, but NET installation
-    $TeXLiveURL = $location = TeXLive::TLUtils::give_ctan_mirror();
+    $TeXLiveURL = $location = TeXLive::TLUtils::give_ctan_mirror('-allow-ftp' => $opt_allow_ftp);
     $media = 'NET';
   }
 }
@@ -2025,6 +2027,13 @@ fall back to using wget if this is not possible. If you want to disable
 usage of LWP and persistent connections, please use
 B<--no-persistent-downloads>.
 
+=item B<-allow-ftp>
+
+By default if mirror.ctan.org is contacted only http mirrors are accepted.
+Adding this command line switch allows ftp mirrors of the CTAN nodes.
+
+If you set a ftp mirror explicitely, that one is in any case used.
+
 =item B<-debug-translation>
 
 In GUI mode, this switch makes C<tlmgr> report any missing, or more