installer and mirror selection

- don't show the terminal /systems/texlive/tlnet
- allow for reselection in case of load failure


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

1 files changed, 12 insertions, 4 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 6b365a32d96..2615b1c084e 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -493,7 +493,9 @@ if ($opt_profile eq "") {
     exit(3);
   }
 } else {
-  do_remote_init();
+  if (!do_remote_init()) {
+    die ("Exiting installation.\n");
+  }
   read_profile($opt_profile);
 }
 
@@ -569,12 +571,15 @@ sub only_load_remote {
       $media = 'NET';
     }
   }
-  load_tlpdb();
+  return load_tlpdb();
 }
 
 
 sub do_remote_init {
-  only_load_remote(@_);
+  if (!only_load_remote(@_)) {
+    tlwarn("$0: Could not load TeX Live Database from $location, goodbye.\n");
+    return 0;
+  }
   if (!do_version_agree()) {
     TeXLive::TLUtils::tldie <<END_MISMATCH;
 $0: The TeX Live versions of the local installation
@@ -585,6 +590,7 @@ Perhaps you need to use a different CTAN mirror?
 END_MISMATCH
   }
   final_remote_init();
+  return 1;
 }
 
 sub do_version_agree {
@@ -1358,7 +1364,8 @@ END_EXPLICIT_MIRROR
         $do_die = 0;
       }
     }
-    die "$0: Could not load TeX Live Database from $master, goodbye.\n"
+    #die "$0: Could not load TeX Live Database from $master, goodbye.\n"
+    return 0
       if $do_die;
   }
   # set the defaults to what is specified in the tlpdb
@@ -1396,6 +1403,7 @@ END_EXPLICIT_MIRROR
     $default_scheme = "scheme-minimal";
     $vars{'selected_scheme'} = $default_scheme;
   }
+  return 1;
 }
 
 sub initialize_collections {