diff options
| -rwxr-xr-x | Master/install-tl | 4 | ||||
| -rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 8 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLConfig.pm | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/Master/install-tl b/Master/install-tl index 51e17668c24..58cac20f5b6 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -746,9 +746,9 @@ sub only_load_remote { $location =~ s,/(tlpkg(/texlive\.tlpdb)?|archive)?/*$,,; if ($location =~ m/^ctan$/i) { $location = TeXLive::TLUtils::give_ctan_mirror(); - } elsif ($location =~ m/^$TeXLiveServerURL/) { + } elsif ($location =~ m/^$TeXLiveServerURLRegexp/) { my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base(); - $location =~ s,^($TeXLiveServerURL|ctan$),$mirrorbase,; + $location =~ s,^($TeXLiveServerURLRegexp|ctan$),$mirrorbase,; } $TeXLiveURL = $location; $media = 'NET'; diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index b53ab27a929..78221b0616d 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -7007,9 +7007,9 @@ sub _init_tlmedia { # choose a mirror if we are asked. if ($location =~ m/^ctan$/i) { $location = give_ctan_mirror(); - } elsif ($location =~ m,^$TeXLiveServerURL,) { + } elsif ($location =~ m,^$TeXLiveServerURLRegexp,) { my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base(); - $location =~ s,^$TeXLiveServerURL,$mirrorbase,; + $location =~ s,^$TeXLiveServerURLRegexp,$mirrorbase,; } my $errormsg; @@ -7049,9 +7049,9 @@ sub setup_one_remotetlpdb { # choose a mirror if we are asked. if ($location =~ m/^ctan$/i) { $location = give_ctan_mirror(); - } elsif ($location =~ m,^$TeXLiveServerURL,) { + } elsif ($location =~ m,^$TeXLiveServerURLRegexp,) { my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base(); - $location =~ s,^$TeXLiveServerURL,$mirrorbase,; + $location =~ s,^$TeXLiveServerURLRegexp,$mirrorbase,; } # if we talk about a net location try to download the hash of the tlpdb diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index 3a7e8d1f101..0b2862c163b 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -35,6 +35,7 @@ BEGIN { $BlockSize $Archive $TeXLiveServerURL + $TeXLiveServerURLRegexp $TeXLiveServerPath $TeXLiveURL @CriticalPackagesList @@ -102,6 +103,7 @@ our $MaxLWPReinitCount = 10; our $Archive = "archive"; our $TeXLiveServerURL = "https://mirror.ctan.org"; +our $TeXLiveServerURLRegexp = 'https?://mirror\.ctan\.org'; # from 2009 on we try to put them all into tlnet directly without any # release year since we hope that we can switch over to 2010 on the fly # our $TeXLiveServerPath = "systems/texlive/tlnet/$ReleaseYear"; @@ -341,6 +343,7 @@ The assumed block size, currently 4k. These values specify where to find packages. =item C<$TeXLive::TLConfig::TeXLiveServerURL> +=item C<$TeXLive::TLConfig::TeXLiveServerURLRegexp> =item C<$TeXLive::TLConfig::TeXLiveServerPath> C<TeXLiveURL> is concatenated from these values, with a string between. |