From e5850974f8685e99c3164638a17bea64b18deade Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 16 Apr 2017 02:13:01 +0000 Subject: rename option_adjustrepo to adjustrepo only the option_ prefix is reserved for those values that can also be set in the tlpdb, but not for purely install-tl options. Fix that. git-svn-id: svn://tug.org/texlive/trunk@43822 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 4 +--- Master/tlpkg/installer/install-menu-perltk.pl | 4 ++-- Master/tlpkg/installer/install-menu-text.pl | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Master/install-tl b/Master/install-tl index 67355db087f..02fdb6fab59 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -135,7 +135,6 @@ our @collections_std; # 'option_src' => 1, # 'option_fmt' => 0, # 'option_letter' => 0, -# 'option_adjustrepo' => 1, our %vars=( # 'n_' means 'number of'. 'this_platform' => '', 'n_systems_available' => 0, @@ -1638,7 +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_adjustrepo'} = $tlpdb->option("adjustrepo"); $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; @@ -1868,7 +1866,7 @@ sub save_options_into_tlpdb { # if we are told to adjust the repository *and* we are *not* # installing from the network already, we adjust the repository # to the default mirror.ctan.org - if ($vars{'option_adjustrepo'} && ($media ne 'NET')) { + if ($vars{'adjustrepo'} && ($media ne 'NET')) { $localtlpdb->option ("location", $TeXLiveURL); } else { my $final_loc = ($media eq 'NET' ? $location : abs_path($location)); diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index af465638057..14606b03bf0 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 { $adminallyesno = $::yesno[$vars{'option_w32_multi_user'}]; $docyesno = $::yesno[$vars{'option_doc'}]; $restrictedyesno = $::yesno[$vars{'option_write18_restricted'}]; - $adjustrepoyesno = $::yesno[$vars{'option_adjustrepo'}]; + $adjustrepoyesno = $::yesno[$vars{'adjustrepo'}]; } sub menu_abort { @@ -604,7 +604,7 @@ Please select a different mirror.', -text => __("Toggle"), -command => sub { toggle_and_set_opt_variable( - \$vars{'option_adjustrepo'}, \$adjustrepoyesno); }) + \$vars{'adjustrepo'}, \$adjustrepoyesno); }) ->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 53349dbc1c7..edb68277872 100644 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -762,7 +762,7 @@ sub options_menu { my $b_src=obutton($vars{'option_src'}); my $b_fmt=obutton($vars{'option_fmt'}); my $b_letter=obutton($vars{'option_letter'}); - my $b_adjustrepo=obutton($vars{'option_adjustrepo'}); + my $b_adjustrepo=obutton($vars{'adjustrepo'}); my $b_deskint=obutton( $vars{'option_desktop_integration'}, \@::deskintdesc); my $b_admin=obutton($vars{'option_w32_multi_user'}); @@ -939,7 +939,7 @@ EOF return $command{'self'}; } elsif ("\u$answer" eq 'Y' and $media ne "NET") { - toggle 'option_adjustrepo'; + toggle 'adjustrepo'; return $command{'self'}; } else { @@ -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_adjustrepo=button($vars{'option_adjustrepo'}); + my $b_adjustrepo=button($vars{'adjustrepo'}); my $warn_nobin; -- cgit v1.2.3