- rename the fields where options are saved to opt_....

- adapt the TLPDB.pm to use option_xxx_xxx instead
- fix install-tl and all related files to use the changed name of the functions
- fix a small bug in install-tl gui mode that didn't honor the initial
  setting of the options
- install-tl now takes the initial setting of the opt_ stuff (paper, 
  srcfiles, docfiles, create formats, links) from the installation source's
  texlive.tlpdb, and not hard code it into the installer
- adjust the 00texlive-installation.config.tlpsrc file to ship new names

Bottom line of that: If we want to change some defaults in the installer
we have to change the 00texlive-installation.config.tlpsrc


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

8 files changed, 89 insertions, 75 deletions

diff --git a/Master/install-tl b/Master/install-tl
index efc9c357c74..00d0fa33f80 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -114,6 +114,19 @@ our @collections_lang_doc;
 # The global variable %vars is an associative list which contains all
 # variables and their values which can be changed by the user.
 # needs to be our since TeXLive::TLUtils uses it
+#
+# The following values are taken from the remote tlpdb using the
+#   $tlpdb->option_XXXXX
+# settings (i.e., taken from tlpkg/tlpsrc/00texlive-installation.tlpsrc
+#
+#        'option_symlinks' => 0,
+#        'sys_bin' => '/usr/local/bin',
+#        'sys_man' => '/usr/local/man',
+#        'sys_info' => '/usr/local/info',
+#        'option_doc' => 1,
+#        'option_src' => 1,
+#        'option_fmt' => 0,
+#        'option_letter' => 0,
 our %vars=( # 'n_' means 'number of'.
         'this_platform' => platform(),
         'n_systems_available' => 0,
@@ -121,16 +134,8 @@ our %vars=( # 'n_' means 'number of'.
         'n_collections_selected' => 0,
         'n_collections_available' => 0,
         'total_size' => 0,
-        'option_symlinks' => 0,
-        'sys_bin' => '/usr/local/bin',
-        'sys_man' => '/usr/local/man',
-        'sys_info' => '/usr/local/info',
         'src_splitting_supported' => 1,
         'doc_splitting_supported' => 1,
-        'option_doc' => 1,
-        'option_src' => 1,
-        'option_fmt' => 0,
-        'option_letter' => 0,
         'selected_scheme' => $default_scheme,
     );
 
@@ -613,6 +618,15 @@ sub load_tlpdb {
   if (!defined($tlpdb)) {
     die("Cannot load TeX Live Database from $master");
   }
+  # set the defaults to what is specified in the tlpdb
+  $vars{'option_doc'} = $tlpdb->option_install_docfiles;
+  $vars{'option_src'} = $tlpdb->option_install_srcfiles;
+  $vars{'option_fmt'} = $tlpdb->option_create_formats;
+  $vars{'option_letter' } = ( $tlpdb->option_paper eq "letter" ? 1 : 0 );
+  $vars{'option_symlinks'} = $tlpdb->option_create_symlinks;
+  $vars{'sys_bin'} = $tlpdb->option_sys_bin;
+  $vars{'sys_man'} = $tlpdb->option_sys_man;
+  $vars{'sys_info'} = $tlpdb->option_sys_info;
 }
 
 sub initialize_collections {
@@ -761,20 +775,20 @@ sub save_options_into_tlpdb {
   $localtlpdb->option_location(
     (($::_media_ eq 'NET') ? "$TeXLiveURL" : abs_path($::installerdir)));
   $localtlpdb->option_paper($vars{'option_letter'} ? "letter" : "a4");
-  $localtlpdb->option_formats($vars{'option_fmt'} ? "1" : "0");
-  $localtlpdb->option_symlinks($vars{'option_symlinks'} ? "1" : "0");
+  $localtlpdb->option_create_formats($vars{'option_fmt'} ? "1" : "0");
+  $localtlpdb->option_create_symlinks($vars{'option_symlinks'} ? "1" : "0");
   $localtlpdb->option_sys_bin($vars{'sys_bin'});
   $localtlpdb->option_sys_info($vars{'sys_info'});
   $localtlpdb->option_sys_man($vars{'sys_man'});
-  $localtlpdb->option_docfiles($vars{'option_doc'} ? "1" : "0");
-  $localtlpdb->option_srcfiles($vars{'option_doc'} ? "1" : "0");
+  $localtlpdb->option_install_docfiles($vars{'option_doc'} ? "1" : "0");
+  $localtlpdb->option_install_srcfiles($vars{'option_doc'} ? "1" : "0");
   my @archs;
   foreach (keys %vars) {
     if (m/^binary_(.*)$/ ) {
       if ($vars{$_}) { push @archs, $1; }
     }
   }
-  $localtlpdb->option_archs(@archs);
+  $localtlpdb->option_available_archs(@archs);
   $localtlpdb->save();
 }
 
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 8cb6ba25d1c..e35ffcea155 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -176,7 +176,7 @@ if (defined($ret{'format'})) {
   # system("texconfig-sys", "generate", "fmtutil");
   # running fmtutil-sys only in case that at installation time the
   # option for building formats was selected
-  if ($localtlpdb->option_formats) {
+  if ($localtlpdb->option_create_formats) {
     print "running fmtutil-sys --missing\n";
     system("fmtutil-sys", "--missing");
   }
@@ -719,36 +719,36 @@ sub action_option {
     my $loc = shift @ARGV;
     if (defined($loc)) {
       print "Defaulting to", ($loc ? "" : " not"), " install documentation files!\n";
-      $localtlpdb->option_docfiles($loc);
+      $localtlpdb->option_install_docfiles($loc);
       $localtlpdb->save;
     } else {
-      print "Install documentation files: ", $localtlpdb->option_docfiles, "\n";
+      print "Install documentation files: ", $localtlpdb->option_install_docfiles, "\n";
     }
   } elsif ($what =~ m/^srcfiles$/i) {
     # changes the default srcfiles
     my $loc = shift @ARGV;
     if (defined($loc)) {
       print "Defaulting to", ($loc ? "" : " not"), " install source files!\n";
-      $localtlpdb->option_srcfiles($loc);
+      $localtlpdb->option_install_srcfiles($loc);
       $localtlpdb->save;
     } else {
-      print "Install source files: ", $localtlpdb->option_srcfiles, "\n";
+      print "Install source files: ", $localtlpdb->option_install_srcfiles, "\n";
     }
   } elsif ($what =~ m/^formats$/i) {
     # changes the default formats
     my $loc = shift @ARGV;
     if (defined($loc)) {
       print "Defaulting to", ($loc ? "" : " not"), " generate format files on installation!\n";
-      $localtlpdb->option_formats($loc);
+      $localtlpdb->option_create_formats($loc);
       $localtlpdb->save;
     } else {
-      print "Create formats on installation: ", $localtlpdb->option_formats, "\n";
+      print "Create formats on installation: ", $localtlpdb->option_create_formats, "\n";
     }
   } elsif ($what =~ m/^show$/i) {
     print "Default installation source:    ", $localtlpdb->option_location, "\n";
-    print "Create formats on installation: ", ($localtlpdb->option_formats ? "yes": "no"), "\n";
-    print "Install documentation files:    ", ($localtlpdb->option_docfiles ? "yes": "no"), "\n";
-    print "Install source files:           ", ($localtlpdb->option_srcfiles ? "yes": "no"), "\n";
+    print "Create formats on installation: ", ($localtlpdb->option_create_formats ? "yes": "no"), "\n";
+    print "Install documentation files:    ", ($localtlpdb->option_install_docfiles ? "yes": "no"), "\n";
+    print "Install source files:           ", ($localtlpdb->option_install_srcfiles ? "yes": "no"), "\n";
   } else {
     warn "Setting other options currently not supported, please edit texlive.tlpdb!";
   }
@@ -828,9 +828,9 @@ sub action_arch {
       merge_into (\%ret, $tlmediasrc->install_package("bin-tlpsv.win32", $localtlpdb, 1, 0));
     }
     # update the option_archs list of installed archs
-    my @larchs = $localtlpdb->option_archs;
+    my @larchs = $localtlpdb->option_available_archs;
     push @larchs, @todoarchs;
-    $localtlpdb->option_archs(@larchs);
+    $localtlpdb->option_available_archs(@larchs);
     $localtlpdb->save;
   } else {
     die "Unknown option for arch: $what";
@@ -948,7 +948,7 @@ sub action_uninstall {
     $sys_bin = $tlpdb->option_sys_bin;
     $sys_man = $tlpdb->option_sys_man;
     $sys_info= $tlpdb->option_sys_info;
-    $opt_symlinks = $tlpdb->option_symlinks;
+    $opt_symlinks = $tlpdb->option_create_symlinks;
     $texdir = $Master;
     $texmfhome = `kpsewhich -var-value=TEXMFHOME`; chomp($texmfhome);
     $texmfsysvar = `kpsewhich -var-value=TEXMFSYSVAR`; chomp($texmfsysvar);
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl
index 5a44e4d0dd9..49f75e2f8ef 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-config.pl
@@ -10,9 +10,9 @@ our $back_config = $back->add("config",-label => "Configuration");
 $screens{"config"} = $back_config;
 
 my $default_location = $localtlpdb->option_location;
-my $default_formats = ($localtlpdb->option_formats ? "Yes" : "No");
-my $default_docfiles = ($localtlpdb->option_docfiles ? "Yes" : "No");
-my $default_srcfiles = ($localtlpdb->option_srcfiles ? "Yes" : "No");
+my $default_formats = ($localtlpdb->option_create_formats ? "Yes" : "No");
+my $default_docfiles = ($localtlpdb->option_install_docfiles ? "Yes" : "No");
+my $default_srcfiles = ($localtlpdb->option_install_srcfiles ? "Yes" : "No");
 
 # this will be loaded only on unix systems!
 #
@@ -138,16 +138,16 @@ sub menu_default_location {
 sub toggle_setting() {
   my ($key) = @_;
   if ($key eq "formats") { 
-    my $new = not($localtlpdb->option_formats);
-    $localtlpdb->option_formats($new);
+    my $new = ($localtlpdb->option_create_formats ? 0 : 1);
+    $localtlpdb->option_create_formats($new);
     $default_formats = ($new ? "Yes" : "No");
   } elsif ($key eq "srcfiles") {
-    my $new = not($localtlpdb->option_srcfiles);
-    $localtlpdb->option_srcfiles($new);
+    my $new = ($localtlpdb->option_install_srcfiles ? 0 : 1);
+    $localtlpdb->option_install_srcfiles($new);
     $default_srcfiles = ($new ? "Yes" : "No");
   } elsif ($key eq "docfiles") {
-    my $new = not($localtlpdb->option_docfiles);
-    $localtlpdb->option_docfiles($new);
+    my $new = ($localtlpdb->option_install_docfiles ? 0 : 1);
+    $localtlpdb->option_install_docfiles($new);
     $default_docfiles = ($new ? "Yes" : "No");
   }
   $localtlpdb->save;
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm
index decf8303a6d..271eed0a4a7 100644
--- a/Master/tlpkg/TeXLive/TLMedia.pm
+++ b/Master/tlpkg/TeXLive/TLMedia.pm
@@ -104,8 +104,8 @@ sub install_package {
     my $container_src_split = $fromtlpdb->config_src_container;
     my $container_doc_split = $fromtlpdb->config_doc_container;
     # get options about src/doc splitting from $totlpdb
-    my $opt_src = $totlpdb->option_srcfiles;
-    my $opt_doc = $totlpdb->option_docfiles;
+    my $opt_src = $totlpdb->option_install_srcfiles;
+    my $opt_doc = $totlpdb->option_install_docfiles;
     my $real_opt_doc = $opt_doc;
     if ($tlpobj->category =~ m/documentation/i) {
       # we do install documenation files for category Documentation
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 93226a49fab..a8e00e67f65 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -285,13 +285,13 @@ sub save {
 =item C<< $tlpdb->available_architectures >>
 
 The C<available_architectures> functions returns the list of available 
-architectures as set in the options section (i.e., using option_archs)
+architectures as set in the options section (i.e., using option_available_archs)
 
 =cut
 
 sub available_architectures {
   my $self = shift;
-  my @archs = $self->option_archs;
+  my @archs = $self->option_available_archs;
   if (! @archs) {
     # fall back to the old method checking bin-tex\.*
     my @packs = $self->list_packages;
@@ -828,36 +828,36 @@ sub _option_value {
   return;
 }
 
-sub option_archs {
+sub option_available_archs {
   my $self = shift;
-  if (@_) { $self->_set_option_value("archs","@_"); }
-  my @archs = split ' ', $self->_option_value("archs");
+  if (@_) { $self->_set_option_value("available_archs","@_"); }
+  my @archs = split ' ', $self->_option_value("available_archs");
   return @archs;
 }
-sub option_symlinks { 
+sub option_create_symlinks { 
   my $self = shift; 
-  if (@_) { $self->_set_option_value("symlinks", shift); }
-  return $self->_option_value("symlinks"); 
+  if (@_) { $self->_set_option_value("opt_create_symlinks", shift); }
+  return $self->_option_value("opt_create_symlinks"); 
 }
-sub option_docfiles { 
+sub option_install_docfiles { 
   my $self = shift;
-  if (@_) { $self->_set_option_value("docfiles", shift); }
-  return $self->_option_value("docfiles"); 
+  if (@_) { $self->_set_option_value("opt_install_docfiles", shift); }
+  return $self->_option_value("opt_install_docfiles"); 
 }
-sub option_srcfiles {
+sub option_install_srcfiles {
   my $self = shift;
-  if (@_) { $self->_set_option_value("srcfiles", shift); }
-  return $self->_option_value("srcfiles");
+  if (@_) { $self->_set_option_value("opt_install_srcfiles", shift); }
+  return $self->_option_value("opt_install_srcfiles");
 }
-sub option_formats { 
+sub option_create_formats { 
   my $self = shift; 
-  if (@_) { $self->_set_option_value("formats", shift); }
-  return $self->_option_value("formats"); 
+  if (@_) { $self->_set_option_value("opt_create_formats", shift); }
+  return $self->_option_value("opt_create_formats"); 
 }
 sub option_paper { 
   my $self = shift; 
-  if (@_) { $self->_set_option_value("paper", shift); }
-  return $self->_option_value("paper"); 
+  if (@_) { $self->_set_option_value("opt_paper", shift); }
+  return $self->_option_value("opt_paper"); 
 }
 sub option_location { 
   my $self = shift; 
@@ -870,18 +870,18 @@ sub option_location {
 }
 sub option_sys_bin {
   my $self = shift;
-  if (@_) { $self->_set_option_value("sys_bin", shift); }
-  return $self->_option_value("sys_bin");
+  if (@_) { $self->_set_option_value("opt_sys_bin", shift); }
+  return $self->_option_value("opt_sys_bin");
 }
 sub option_sys_man {
   my $self = shift;
-  if (@_) { $self->_set_option_value("sys_man", shift); }
-  return $self->_option_value("sys_man");
+  if (@_) { $self->_set_option_value("opt_sys_man", shift); }
+  return $self->_option_value("opt_sys_man");
 }
 sub option_sys_info {
   my $self = shift;
-  if (@_) { $self->_set_option_value("sys_info", shift); }
-  return $self->_option_value("sys_info");
+  if (@_) { $self->_set_option_value("opt_sys_info", shift); }
+  return $self->_option_value("opt_sys_info");
 }
 sub option_platform {
   my $self = shift;
diff --git a/Master/tlpkg/bin/tlpsrc2tlpdb b/Master/tlpkg/bin/tlpsrc2tlpdb
index 4b67856f0b0..f0db6132b6f 100755
--- a/Master/tlpkg/bin/tlpsrc2tlpdb
+++ b/Master/tlpkg/bin/tlpsrc2tlpdb
@@ -116,7 +116,7 @@ sub main
   if ($opt_all) {
     $tldb->root("$opt_master");
     # do set the option_archs from the dirs in Master/bin
-    $tldb->option_archs($tltree->architectures);
+    $tldb->option_available_archs($tltree->architectures);
     $tldb->save;
     info("$0: wrote $src_count packages to ". $tldb->root . ".\n");
   } else {
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 2b72870873b..00bb281d222 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -190,10 +190,10 @@ if (($::lang ne "en") && ($::lang ne "C")) {
   }
 }
 
-my $letteryesno = $text{'no'};
-my $fmtyesno = $text{'no'};
-my $srcyesno = $text{'yes'};
-my $docyesno = $text{'yes'};
+my $letteryesno = ( $vars{'option_letter'} ? $text{'yes'} : $text{'no'} );
+my $fmtyesno = ( $vars{'option_fmt'} ? $text{'yes'} : $text{'no'} );
+my $srcyesno = ( $vars{'option_src'} ? $text{'yes'} : $text{'no'} );
+my $docyesno = ( $vars{'option_doc'} ? $text{'yes'} : $text{'no'} );
 
 sub run_menu {
   # computing $a:
diff --git a/Master/tlpkg/tlpsrc/00texlive-installation.config.tlpsrc b/Master/tlpkg/tlpsrc/00texlive-installation.config.tlpsrc
index ceedb22e802..200007d3098 100644
--- a/Master/tlpkg/tlpsrc/00texlive-installation.config.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive-installation.config.tlpsrc
@@ -2,11 +2,11 @@ name 00texlive-installation.config
 category TLCore
 depend platform:
 depend location:__MASTER__
-depend paper:a4
-depend formats:0
-depend symlinks:0
-depend sys_bin:/usr/local/bin
-depend sys_info:/usr/local/info
-depend sys_man:/usr/local/man
-depend docfiles:0
-depend srcfiles:0
+depend opt_paper:a4
+depend opt_create_formats:0
+depend opt_create_symlinks:0
+depend opt_sys_bin:/usr/local/bin
+depend opt_sys_info:/usr/local/info
+depend opt_sys_man:/usr/local/man
+depend opt_install_docfiles:1
+depend opt_install_srcfiles:1