summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-04-16 02:13:30 +0000
committerNorbert Preining <preining@logic.at>2017-04-16 02:13:30 +0000
commit4a0c4fb16d37da3fb452c9ea352af130944a68fa (patch)
tree6ea977f0200bdb3ef342a17916dc4b5e631a5f59 /Master/install-tl
parent77eebb0917ca720ee9b5bb8a5be72bd1fa634709 (diff)
write18_restricted is an installer option, adjust naming
git-svn-id: svn://tug.org/texlive/trunk@43826 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl8
1 files changed, 3 insertions, 5 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