From 219afd32966778a9ba24a031a7a820c3288b4eba Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 16 Apr 2017 02:13:09 +0000 Subject: treat $opt_in_place special and don't save it into %vars git-svn-id: svn://tug.org/texlive/trunk@43823 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/installer/install-menu-perltk.pl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Master/tlpkg/installer/install-menu-perltk.pl') diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 14606b03bf0..fd3cf112309 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -34,6 +34,7 @@ use utf8; no utf8; our %vars; +our $opt_in_place; our $tlpdb; our @collections_std; our $texlive_release; @@ -306,7 +307,7 @@ Please select a different mirror.', } })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); } - if (!$vars{'in_place'}) { + if (!$opt_in_place) { $row++; $fr->Label(-text => "------- " . __("Basic Information") . " -------") @@ -376,7 +377,7 @@ Please select a different mirror.', ->grid(-row => $row, -column => 1, -sticky => 'w'); $texdirtext = $fr->Label(-anchor => 'w') ->grid(-row => $row, -column => 2, -padx => "2m"); - if (!$vars{'in_place'}) { + if (!$opt_in_place) { if ($::alternative_selector) { $texdir_toggle_button = $fr->Button( -text => __("Change"), -command => sub { menu_edit_texdir("TEXDIR"); }) @@ -493,7 +494,7 @@ Please select a different mirror.', toggle_and_set_opt_variable(\$vars{'option_fmt'}, \$fmtyesno); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); - if ($vars{'doc_splitting_supported'} and !$vars{'in_place'}) { + if ($vars{'doc_splitting_supported'} and !$opt_in_place) { $row++; $fr->Label(-text => __('Install font/macro doc tree'), -anchor => 'w') ->grid(-row => $row, -column => 1, -sticky => 'w'); @@ -506,7 +507,7 @@ Please select a different mirror.', ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); } - if ($vars{'src_splitting_supported'} and !$vars{'in_place'}) { + if ($vars{'src_splitting_supported'} and !$opt_in_place) { $row++; $fr->Label(-text => __('Install font/macro source tree'), -anchor => 'w') ->grid(-row => $row, -column => 1, -sticky => 'w'); @@ -583,7 +584,7 @@ Please select a different mirror.', ->grid(-row => $row, -column => 1, -sticky => 'w'); $fr->Label(-anchor => 'w', -textvariable => \$editoryesno) ->grid(-row => $row, -column => 2, -padx => "2m"); - if (!$vars{'in_place'}) { + if (!$opt_in_place) { $texworks_toggle_button = $fr->Button( -text => __("Toggle"), -command => sub { @@ -705,7 +706,7 @@ sub pre_warn { return $ans eq $b_quit; } -# this sub will not be called if $vars{'in_place'} +# this sub will not be called if $opt_in_place sub menu_edit_texdir { my $key = shift; our $addyear = 1; -- cgit v1.2.3