summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl14
1 files changed, 3 insertions, 11 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 9efa22d2868..8c802f1bdc6 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -214,7 +214,6 @@ 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);
@@ -375,9 +374,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('-allow-ftp' => $opt_allow_ftp);
+ $location = TeXLive::TLUtils::give_ctan_mirror();
} elsif ($location =~ m/^$TeXLiveServerURL/) {
- my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base('-allow-ftp' => $opt_allow_ftp);
+ my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base();
$location =~ s,^($TeXLiveServerURL|ctan$),$mirrorbase,;
}
$TeXLiveURL = $location;
@@ -407,7 +406,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('-allow-ftp' => $opt_allow_ftp);
+ $TeXLiveURL = $location = TeXLive::TLUtils::give_ctan_mirror();
$media = 'NET';
}
}
@@ -2027,13 +2026,6 @@ 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