summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-09-15 19:41:04 +0000
committerNorbert Preining <preining@logic.at>2009-09-15 19:41:04 +0000
commitb5245a41295e137f6ad2a112670a4bb127cc7cc7 (patch)
tree133974ecbe53027abfb4982142d33f96b450d312
parentb81e91749e296531cd044fe9ffb5d83dba49f27e (diff)
fix missing renames option_restricted -> option_write18_restricted
git-svn-id: svn://tug.org/texlive/trunk@15308 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl4
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl6
2 files changed, 5 insertions, 5 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 9e084c06063..de1c8b26dbd 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -80,7 +80,7 @@ my $fileassocyesno = $::fileassocdesc[$vars{'option_file_assocs'}];
my $editoryesno = ( $vars{'addon_editor'} ? __("Yes") : __("No") );
my $adminallyesno = ( $vars{'option_w32_multi_user'} ? __("Yes") : __("No") );
my $docyesno = ( $vars{'option_doc'} ? __("Yes") : __("No") );
-my $restrictedyesno = ( $vars{'option_restricted'} ? __("Yes") : __("No") );
+my $restrictedyesno = ( $vars{'option_write18_restricted'} ? __("Yes") : __("No") );
$::run_menu = \&run_menu_perltk;
@@ -257,7 +257,7 @@ sub run_menu_perltk {
$row++;
$fr->Label(-text => __('Allow execution of restricted list of programs via \write18'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
$fr->Label(-anchor => 'w', -textvariable => \$restrictedyesno)->grid(-row => $row, -column => 2, -padx => "2m");
- $fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'option_restricted'}, \$restrictedyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
+ $fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'option_write18_restricted'}, \$restrictedyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
if ($vars{'doc_splitting_supported'}) {
$row++;
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 1537bdedacb..ba14da66d2e 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -700,7 +700,7 @@ sub options_menu {
my $b_deskint=button($vars{'option_desktop_integration'});
my $b_admin=button($vars{'option_w32_multi_user'});
my $b_addoneditor=button($vars{'addon_editor'});
- my $b_restricted = button($vars{'option_restricted'});
+ my $b_restricted = button($vars{'option_write18_restricted'});
my $sys_bin=$vars{'option_sys_bin'};
my $sys_man=$vars{'option_sys_man'};
@@ -830,7 +830,7 @@ EOF
return $command{'self'};
} elsif ("\u$answer" eq 'E') {
- toggle 'option_restricted';
+ toggle 'option_write18_restricted';
return $command{'self'};
} elsif ("\u$answer" eq 'S' and !$vars{'from_dvd'}) {
@@ -886,7 +886,7 @@ sub main_menu {
my $b_deskint=button($vars{'option_desktop_integration'});
my $b_admin=button($vars{'option_w32_multi_user'});
my $b_addoneditor=button($vars{'addon_editor'});
- my $b_restricted = button($vars{'option_restricted'});
+ my $b_restricted = button($vars{'option_write18_restricted'});
my $warn_nobin;