* TeXLive/TLPDB.tpm: debugging text, comments.

* TeXLive/TLMedia.pm: debugging text, remove unused use Cwd.
* TeXLive/ TLUtils.pm (download_file, give_ctan_mirror): insert our
  desired custom wget overrides here (--timeout=60 for both and
  --tries=8 for the former).
* installer/wgetrc: remove this file, so people's personal settings
  (e.g., for proxies) will take effect.
* install-tl (WGETRC): do not set this in the environment.
  (main): run give_ctan_mirror if the TeXLiveServerUrl or literal "ctan" is
  given, a la tlmgr; update doc.


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

1 files changed, 14 insertions, 12 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 994ab0e3b48..497e8cd1e39 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -76,6 +76,7 @@ use TeXLive::TLUtils qw(platform platform_desc
    get_system_tmpdir member process_logging_options rmtree
    mkdirhier make_var_skeleton make_local_skeleton install_package copy
    install_packages dirname setup_programs welcome welcome_paths);
+use TeXLive::TLMedia;
 use TeXLive::TLPOBJ;
 use TeXLive::TLPDB;
 use TeXLive::TLConfig;
@@ -375,20 +376,20 @@ if ($opt_gui && !$opt_no_gui && ($opt_profile eq "")) {
 # initialize the correct platform
 platform();
 if (!setup_programs ("$::installerdir/tlpkg/installer", "$::_platform_")) {
-  tlwarn("Couldn't set up the necessary programs.\n"
-         . "Cannot continue with installation.\n"
-         . "Please report to texlive\@tug.org.\n");
+  tlwarn("Couldn't set up the necessary programs;\n"
+         . "perhaps your platform is not supported.\n");
   exit 1;
 }
-$ENV{'WGETRC'}="$::installerdir/tlpkg/installer/wgetrc";
 
-#
-# determine from where we do install
+# determine where we will find the distribution to install from.
 #
 $location = $opt_location;
 $location || ($location = "$::installerdir");
-if ($location =~ m!^(http|ftp)://!i) {
+if ($location =~ m!^(ctan$|(http|ftp)://)!i) {
   $location =~ s,/(tlpkg|archive)?/*$,,;  # remove any trailing tlpkg or /
+  if ($location =~ m/^($TeXLiveServerURL|ctan$)/) {
+    $location = TeXLive::TLUtils::give_ctan_mirror();
+  }
   $TeXLiveURL = $location;
   $media = 'NET';
 } else {
@@ -793,7 +794,7 @@ sub load_tlpdb {
   info("Loading $master/$TeXLive::TLConfig::InfraLocation/$TeXLive::TLConfig::DatabaseName\n");
   $tlpdb=TeXLive::TLPDB->new(root => "$master");
   if (!defined($tlpdb)) {
-    die("Cannot load TeX Live Database from $master");
+    die "$0: Could not load TeX Live Database from $master, goodbye.\n";
   }
   # set the defaults to what is specified in the tlpdb
   $vars{'option_doc'} = $tlpdb->option_install_docfiles;
@@ -1517,7 +1518,7 @@ of using a local directory:
 
 If the location is on the network, trailing C</> characters and/or
 trailing C</tlpkg> and C</archive> components are ignored.  For example,
-you could choose a particular CTAN mirror with something like:
+you could choose a particular CTAN mirror with something like this:
 
   -location http://ctan.example.org/tex-archive/texlive/tlnet/2008
 
@@ -1526,9 +1527,10 @@ have to be specified.  (The list of CTAN mirrors is maintained at
 L<http://ctan.org/mirrors>.)
 
 The default is to pick a mirror automatically, using
-L<http://mirror.ctan.org>; the chosen mirror is used for the entire
-download.  (See L<http://ctan.org> for more about the CTAN mirror
-services.)
+L<http://mirror.ctan.org/systems/texlive/tlnet/YYYY>; the chosen mirror
+is used for the entire download.  You can use the special location name
+C<ctan> as an abbreviation for this.  See L<http://ctan.org> for more
+about CTAN and its mirrors.
 
 After installation is complete, you can use that installation as the
 location for another installation.  If you chose to install less than