From 4a0c4fb16d37da3fb452c9ea352af130944a68fa Mon Sep 17 00:00:00 2001
From: Norbert Preining <preining@logic.at>
Date: Sun, 16 Apr 2017 02:13:30 +0000
Subject: write18_restricted is an installer option, adjust naming

git-svn-id: svn://tug.org/texlive/trunk@43826 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/install-tl                             | 8 +++-----
 Master/tlpkg/installer/install-menu-perltk.pl | 4 ++--
 Master/tlpkg/installer/install-menu-text.pl   | 6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Master/install-tl b/Master/install-tl
index 0dc55c7ae59..c505da28b74 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -147,6 +147,7 @@ our %vars=( # 'n_' means 'number of'.
         'instopt_portable' => 0,
         'instopt_letter' => 0,
         'instopt_adjustrepo' => 1,
+        'instopt_write18_restricted' => 1,
     );
 
 # option handling
@@ -1273,7 +1274,7 @@ EOF
   # default in texmf-dist/web2c/texmf.cnf is
   #   shell_escape = p
   # so we write that only if the user *deselected* this option
-  if (!$vars{"option_write18_restricted"}) {
+  if (!$vars{"instopt_write18_restricted"}) {
     print TMF <<EOF;
 
 % Disable system commands via \\write18{...}.  See texmf-dist/web2c/texmf.cnf.
@@ -1328,7 +1329,7 @@ EOF
   }
   print TMFLUA "    },\n";
   print TMFLUA "  },\n";
-  if (!$vars{"option_write18_restricted"}) {
+  if (!$vars{"instopt_write18_restricted"}) {
     print TMFLUA <<EOF;
   directives = {
        -- Disable system commands.  See texmf-dist/web2c/texmfcnf.lua
@@ -1636,9 +1637,6 @@ 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_write18_restricted'} = $tlpdb->option("write18_restricted");
-  # this option is not stored in tlpdb if an existing installation is used
-  $vars{'option_write18_restricted'} ||= 1;
 
   # check that the default scheme is actually present, otherwise switch to
   # scheme-minimal
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 8f6a6ea3e88..4bdf84bbc0a 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -137,7 +137,7 @@ sub setup_perltk_local_strings {
   $editoryesno = $::yesno[$vars{'collection-texworks'}];
   $adminallyesno = $::yesno[$vars{'option_w32_multi_user'}];
   $docyesno = $::yesno[$vars{'option_install_docfiles'}];
-  $restrictedyesno = $::yesno[$vars{'option_write18_restricted'}];
+  $restrictedyesno = $::yesno[$vars{'instopt_write18_restricted'}];
   $adjustrepoyesno = $::yesno[$vars{'instopt_adjustrepo'}];
 }
 
@@ -478,7 +478,7 @@ Please select a different mirror.',
     -text => __("Toggle"),
     -command => sub {
       toggle_and_set_opt_variable(
-        \$vars{'option_write18_restricted'},
+        \$vars{'instopt_write18_restricted'},
         \$restrictedyesno); })
     ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
 
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 8cec73c7764..2d73ccaa5b3 100644
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -768,7 +768,7 @@ sub options_menu {
     $vars{'option_desktop_integration'}, \@::deskintdesc);
   my $b_admin=obutton($vars{'option_w32_multi_user'});
   my $b_addoneditor=obutton($vars{'collection-texworks'});
-  my $b_restricted=obutton($vars{'option_write18_restricted'});
+  my $b_restricted=obutton($vars{'instopt_write18_restricted'});
 
   my $sys_bin=$vars{'option_sys_bin'};
   my $sys_man=$vars{'option_sys_man'};
@@ -920,7 +920,7 @@ EOF
     return $command{'self'};
 
   } elsif ("\u$answer" eq 'E') {
-    toggle 'option_write18_restricted';
+    toggle 'instopt_write18_restricted';
     return $command{'self'};
 
   } elsif ("\u$answer" eq 'S' and !$opt_in_place) {
@@ -998,7 +998,7 @@ sub main_menu {
   }
   my $b_admin=button($vars{'option_w32_multi_user'});
   my $b_addoneditor=button($vars{'collection-texworks'});
-  my $b_restricted=button($vars{'option_write18_restricted'});
+  my $b_restricted=button($vars{'instopt_write18_restricted'});
   my $b_adjustrepo=button($vars{'instopt_adjustrepo'});
 
   my $warn_nobin;
-- 
cgit v1.2.3