- 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

2 files changed, 22 insertions, 22 deletions

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;