use tlpdbopt_ instead of option_

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

1 files changed, 24 insertions, 24 deletions

diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index d781fe5e9f6..9733009886a 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -129,14 +129,14 @@ $::run_menu = \&run_menu_perltk;
 sub setup_perltk_local_strings {
   $portableyesno = $::yesno[$vars{'instopt_portable'}];
   $letteryesno = $::letterdesc[$vars{'instopt_letter'}];
-  $fmtyesno = $::yesno[$vars{'option_create_formats'}];
-  $srcyesno = $::yesno[$vars{'option_install_srcfiles'}];
-  $deskintyesno = $::deskintdesc[$vars{'option_desktop_integration'}];
+  $fmtyesno = $::yesno[$vars{'tlpdbopt_create_formats'}];
+  $srcyesno = $::yesno[$vars{'tlpdbopt_install_srcfiles'}];
+  $deskintyesno = $::deskintdesc[$vars{'tlpdbopt_desktop_integration'}];
   $pathadjyesno = $::yesno[$vars{'instopt_path'}];
-  $fileassocyesno = $::fileassocdesc[$vars{'option_file_assocs'}];
+  $fileassocyesno = $::fileassocdesc[$vars{'tlpdbopt_file_assocs'}];
   $editoryesno = $::yesno[$vars{'collection-texworks'}];
-  $adminallyesno = $::yesno[$vars{'option_w32_multi_user'}];
-  $docyesno = $::yesno[$vars{'option_install_docfiles'}];
+  $adminallyesno = $::yesno[$vars{'tlpdbopt_w32_multi_user'}];
+  $docyesno = $::yesno[$vars{'tlpdbopt_install_docfiles'}];
   $restrictedyesno = $::yesno[$vars{'instopt_write18_restricted'}];
   $adjustrepoyesno = $::yesno[$vars{'instopt_adjustrepo'}];
 }
@@ -491,7 +491,7 @@ Please select a different mirror.',
   $format_toggle_button = $fr->Button(
     -text => __("Toggle"),
     -command => sub {
-      toggle_and_set_opt_variable(\$vars{'option_create_formats'}, \$fmtyesno); })
+      toggle_and_set_opt_variable(\$vars{'tlpdbopt_create_formats'}, \$fmtyesno); })
     ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
 
   if ($vars{'doc_splitting_supported'} and !$opt_in_place) {
@@ -503,7 +503,7 @@ Please select a different mirror.',
     $doc_files_toggle_button = $fr->Button(
       -text => __("Toggle"),
       -command => sub {
-        toggle_and_set_opt_variable(\$vars{'option_install_docfiles'}, \$docyesno); })
+        toggle_and_set_opt_variable(\$vars{'tlpdbopt_install_docfiles'}, \$docyesno); })
       ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
   }
 
@@ -516,7 +516,7 @@ Please select a different mirror.',
     $src_files_toggle_button = $fr->Button(
       -text => __("Toggle"),
       -command => sub {
-        toggle_and_set_opt_variable(\$vars{'option_install_srcfiles'}, \$srcyesno); })
+        toggle_and_set_opt_variable(\$vars{'tlpdbopt_install_srcfiles'}, \$srcyesno); })
       ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
   }
 
@@ -549,7 +549,7 @@ Please select a different mirror.',
       -text => __("Change"),
       -command => sub {
         toggle_and_set_opt_variable(
-          \$vars{'option_desktop_integration'},
+          \$vars{'tlpdbopt_desktop_integration'},
           \$deskintyesno, \@::deskintdesc); })
       ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
 
@@ -562,7 +562,7 @@ Please select a different mirror.',
       -text => __("Change"),
       -command => sub {
         toggle_and_set_opt_variable(
-          \$vars{'option_file_assocs'}, \$fileassocyesno, \@::fileassocdesc); })
+          \$vars{'tlpdbopt_file_assocs'}, \$fileassocyesno, \@::fileassocdesc); })
       ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
 
     if ($::opt_all_options || admin()) {
@@ -575,7 +575,7 @@ Please select a different mirror.',
         -text => __("Toggle"),
         -command => sub {
           toggle_and_set_opt_variable(
-            \$vars{'option_w32_multi_user'}, \$adminallyesno); })
+            \$vars{'tlpdbopt_w32_multi_user'}, \$adminallyesno); })
         ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
     }
 
@@ -944,9 +944,9 @@ sub menu_select_symlink {
   our $osym = $vars{'instopt_path'};
   our ($binlab,$binb,$manlab,$manb,$infolab,$infob);
   sub set_unset_buttons {
-    $lbin = ($osym ? $vars{'option_sys_bin'} : '');
-    $linfo = ($osym ? $vars{'option_sys_info'} : '');
-    $lman = ($osym ? $vars{'option_sys_man'} : '');
+    $lbin = ($osym ? $vars{'tlpdbopt_sys_bin'} : '');
+    $linfo = ($osym ? $vars{'tlpdbopt_sys_info'} : '');
+    $lman = ($osym ? $vars{'tlpdbopt_sys_man'} : '');
     if ($osym) {
       $binb->configure (-state => 'normal');
       $manb->configure (-state => 'normal');
@@ -965,9 +965,9 @@ sub menu_select_symlink {
       $lbin =~ s/^~/$home/;
       $linfo =~ s/^~/$home/;
       $lman =~ s/^~/$home/;
-      $vars{'option_sys_bin'} = $lbin;
-      $vars{'option_sys_info'} = $linfo;
-      $vars{'option_sys_man'} = $lman;
+      $vars{'tlpdbopt_sys_bin'} = $lbin;
+      $vars{'tlpdbopt_sys_info'} = $linfo;
+      $vars{'tlpdbopt_sys_man'} = $lman;
     }
     $vars{'instopt_path'} = $osym;
     toggle_and_set_opt_variable(\$vars{'instopt_path'}, \$pathadjyesno);
@@ -1152,9 +1152,9 @@ sub menu_update_texts {
   menu_set_binbutton_text;
   menu_set_schemebutton_text;
   $optletterstate = $::letterdesc[$vars{'instopt_letter'}];
-  $optfmtstate = ($vars{'option_create_formats'} ? __("Yes") : __("No"));
-  $optsrcstate = ($vars{'option_install_srcfiles'} ? __("Yes") : __("No"));
-  $optdocstate = ($vars{'option_install_docfiles'} ? __("Yes") : __("No"));
+  $optfmtstate = ($vars{'tlpdbopt_create_formats'} ? __("Yes") : __("No"));
+  $optsrcstate = ($vars{'tlpdbopt_install_srcfiles'} ? __("Yes") : __("No"));
+  $optdocstate = ($vars{'tlpdbopt_install_docfiles'} ? __("Yes") : __("No"));
 }
 
 sub callback_select_scheme {
@@ -1252,9 +1252,9 @@ sub toggle_portable {
         $b->configure(-state => 'disabled');
     }
     $vars{'instopt_path'} = 0;
-    $vars{'option_desktop_integration'} = 0;
-    $vars{'option_file_assocs'} = 0;
-    $vars{'option_w32_multi_user'} = 0;
+    $vars{'tlpdbopt_desktop_integration'} = 0;
+    $vars{'tlpdbopt_file_assocs'} = 0;
+    $vars{'tlpdbopt_w32_multi_user'} = 0;
     $deskintyesno = __("No");
     $pathadjyesno = __("No");
     $fileassocyesno = __("None");