add installer option for adjusting the repository after installation

defaults to yes
asked only in text and pertk installer, not in wizard


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

1 files changed, 11 insertions, 2 deletions

diff --git a/Master/install-tl b/Master/install-tl
index eb394890a32..d993f612384 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -132,6 +132,7 @@ our @collections_lang_doc;
 #        'option_src' => 1,
 #        'option_fmt' => 0,
 #        'option_letter' => 0,
+#        'option_adjustrepo' => 1,
 our %vars=( # 'n_' means 'number of'.
         'this_platform' => '',
         'n_systems_available' => 0,
@@ -310,7 +311,7 @@ my $finished = 0;
 @::info_hook = ();
 
 my $system_tmpdir=get_system_tmpdir();
-my $media;
+our $media;
 our @media_available;
 
 # special uses of install-tl:
@@ -1391,6 +1392,7 @@ END_EXPLICIT_MIRROR
   $vars{'option_sys_bin'} = $tlpdb->option("sys_bin");
   $vars{'option_sys_man'} = $tlpdb->option("sys_man");
   $vars{'option_sys_info'} = $tlpdb->option("sys_info");
+  $vars{'option_adjustrepo'} = $tlpdb->option("adjustrepo");
   $vars{'option_write18_restricted'} = $tlpdb->option("write18_restricted");
   # this option is not stored in tlpdb if an existing installation is used
   $vars{'option_write18_restricted'} ||= 1;
@@ -1591,7 +1593,14 @@ sub do_install_packages {
 # into the local tlpdb:
 # - should links be set, and if yes, the destination (bin,man,info)
 sub save_options_into_tlpdb {
-  $localtlpdb->option ("location", $location);
+  # if we are told to adjust the repository *and* we are *not*
+  # installing from the network already, we adjust the repository
+  # to the default mirror.ctan.org
+  if ($vars{'option_adjustrepo'} && ($media ne 'NET')) {
+    $localtlpdb->option ("location", $TeXLiveURL); 
+  } else {
+    $localtlpdb->option ("location", $location);
+  }
   $localtlpdb->option ("autobackup", $vars{'option_autobackup'});
   $localtlpdb->option ("backupdir", $vars{'option_backupdir'});
   $localtlpdb->option ("create_formats", $vars{'option_fmt'} ? "1" : "0");