more fixes to the new handling of the mirror

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

2 files changed, 7 insertions, 3 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 84919d14957..769a540fa8a 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -351,8 +351,11 @@ $location = $opt_location;
 $location || ($location = "$::installerdir");
 if ($location =~ m!^(ctan$|(http|ftp)://)!i) {
   $location =~ s,/(tlpkg|archive)?/*$,,;  # remove any trailing tlpkg or /
-  if ($location =~ m/^($TeXLiveServerURL|ctan$)/) {
+  if ($location =~ m/^ctan$/i) {
     $location = TeXLive::TLUtils::give_ctan_mirror();
+  } elsif ($location =~ m/^$TeXLiveServerURL/) {
+    my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base();
+    $location =~ s,^($TeXLiveServerURL|ctan$),$mirrorbase,;
   }
   $TeXLiveURL = $location;
   $media = 'NET';
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index dd2e3321b23..945647da37b 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -3083,10 +3083,11 @@ sub init_tlmedia
   }
 
   # choose a mirror if we are asked.
-  if ($location =~ m,^($TeXLiveServerURL|ctan$),) {
+  if ($location =~ m/^ctan$/i) {
+    $location = give_ctan_mirror();
+  } elsif ($location =~ m,^$TeXLiveServerURL,) {
     my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base();
     $location =~ s,^$TeXLiveServerURL,$mirrorbase,;
-    #$location = give_ctan_mirror();
   }
 
   # this "location-url" line should not be changed since GUI programs