From 105b9323011f96263aa658dab3bbd1b472025359 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 25 May 2010 23:58:11 +0000 Subject: enable restricted option git-svn-id: svn://tug.org/texlive/trunk@18497 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/installer/install-menu-perltk.pl | 11 +++++------ Master/tlpkg/installer/install-menu-text.pl | 9 ++++----- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index be2a85e63f7..9f0af3eb03c 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -249,17 +249,16 @@ sub run_menu_perltk { $fr->Label(-anchor => 'w', -textvariable => \$letteryesno)->grid(-row => $row, -column => 2, -padx => "2m"); $fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'option_letter'}, \$letteryesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); - $row++; - $fr->Label(-text => __('Create all format files'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); - $fr->Label(-anchor => 'w', -textvariable => \$fmtyesno)->grid(-row => $row, -column => 2, -padx => "2m"); - $fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'option_fmt'}, \$fmtyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); - -# until more secure ... $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_write18_restricted'}, \$restrictedyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); + $row++; + $fr->Label(-text => __('Create all format files'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); + $fr->Label(-anchor => 'w', -textvariable => \$fmtyesno)->grid(-row => $row, -column => 2, -padx => "2m"); + $fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'option_fmt'}, \$fmtyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); + if ($vars{'doc_splitting_supported'}) { $row++; $fr->Label(-text => __('Install font/macro doc tree'), -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w'); diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index 788bd9ee937..f3099d1b1a7 100755 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -699,7 +699,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{'collection-texworks'}); - my $b_restricted = button($vars{'option_write18_restricted'}); + my $b_restricted=button($vars{'option_write18_restricted'}); my $sys_bin=$vars{'option_sys_bin'}; my $sys_man=$vars{'option_sys_man'}; @@ -720,9 +720,9 @@ sub options_menu { print <<"EOF";

use letter size instead of A4 by default: $b_letter + execution of restricted list of programs: $b_restricted create format files: $b_fmt EOF -# until secure ... execution of restricted list of programs: $b_restricted ; if ($vars{'doc_splitting_supported'} and !$vars{'from_dvd'}) { print " install font/macro doc tree: $b_doc\n"; @@ -828,7 +828,6 @@ EOF toggle 'option_fmt'; return $command{'self'}; -# until secure ... } elsif ("\u$answer" eq 'E') { toggle 'option_write18_restricted'; return $command{'self'}; @@ -887,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{'collection-texworks'}); - my $b_restricted = button($vars{'option_write18_restricted'}); + my $b_restricted=button($vars{'option_write18_restricted'}); my $warn_nobin; @@ -984,9 +983,9 @@ EOF print <<"EOF"; options: $b_letter use letter size instead of A4 by default + $b_restricted allow execution of restricted list of programs via \\write18 $b_fmt create all format files EOF -# until secure ... $b_restricted allow execution of restricted list of programs via \\write18 if (!$vars{'from_dvd'}) { if ($vars{'doc_splitting_supported'}) { -- cgit v1.2.3