texlive[58938] Master: support both http: and https://mirror.ctan.org

[commits+karl at tug.org]

Revision: 58938
          http://tug.org/svn/texlive?view=revision&revision=58938
Author:   karl
Date:     2021-04-21 23:26:24 +0200 (Wed, 21 Apr 2021)
Log Message:
-----------
support both http: and https://mirror.ctan.org

Modified Paths:
--------------
    trunk/Master/install-tl
    trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
    trunk/Master/tlpkg/TeXLive/TLConfig.pm

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2021-04-21 20:49:33 UTC (rev 58937)
+++ trunk/Master/install-tl	2021-04-21 21:26:24 UTC (rev 58938)
@@ -746,9 +746,9 @@
     $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';

Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2021-04-21 20:49:33 UTC (rev 58937)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2021-04-21 21:26:24 UTC (rev 58938)
@@ -7007,9 +7007,9 @@
   # 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 @@
   # 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

Modified: trunk/Master/tlpkg/TeXLive/TLConfig.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLConfig.pm	2021-04-21 20:49:33 UTC (rev 58937)
+++ trunk/Master/tlpkg/TeXLive/TLConfig.pm	2021-04-21 21:26:24 UTC (rev 58938)
@@ -35,6 +35,7 @@
     $BlockSize
     $Archive
     $TeXLiveServerURL
+    $TeXLiveServerURLRegexp
     $TeXLiveServerPath
     $TeXLiveURL
     @CriticalPackagesList
@@ -102,6 +103,7 @@
 
 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 @@
 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.