diff options
author | Norbert Preining <preining@logic.at> | 2017-04-16 02:13:38 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2017-04-16 02:13:38 +0000 |
commit | f1bc728217cfe6abb4a9b2ed6d26202af0a9b01e (patch) | |
tree | 2162c45f75922002c5dc6ef9dc970c82dd67ef45 /Master/tlpkg/installer | |
parent | 4a0c4fb16d37da3fb452c9ea352af130944a68fa (diff) |
option_path is only installer option, use instopt_path
git-svn-id: svn://tug.org/texlive/trunk@43827 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer')
-rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 12 | ||||
-rw-r--r-- | Master/tlpkg/installer/install-menu-text.pl | 22 | ||||
-rw-r--r-- | Master/tlpkg/installer/install-menu-wizard.pl | 2 | ||||
-rw-r--r-- | Master/tlpkg/installer/installer-options.txt | 4 |
4 files changed, 20 insertions, 20 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 4bdf84bbc0a..d781fe5e9f6 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -132,7 +132,7 @@ sub setup_perltk_local_strings { $fmtyesno = $::yesno[$vars{'option_create_formats'}]; $srcyesno = $::yesno[$vars{'option_install_srcfiles'}]; $deskintyesno = $::deskintdesc[$vars{'option_desktop_integration'}]; - $pathadjyesno = $::yesno[$vars{'option_path'}]; + $pathadjyesno = $::yesno[$vars{'instopt_path'}]; $fileassocyesno = $::fileassocdesc[$vars{'option_file_assocs'}]; $editoryesno = $::yesno[$vars{'collection-texworks'}]; $adminallyesno = $::yesno[$vars{'option_w32_multi_user'}]; @@ -535,7 +535,7 @@ Please select a different mirror.', $pathbutton = $fr->Button( -text => __("Toggle"), -command => sub { - toggle_and_set_opt_variable(\$vars{'option_path'}, \$pathadjyesno); }); + toggle_and_set_opt_variable(\$vars{'instopt_path'}, \$pathadjyesno); }); } $pathbutton->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); @@ -941,7 +941,7 @@ sub menu_select_standard_collections { sub menu_select_symlink { our ($lbin,$lman,$linfo); - our $osym = $vars{'option_path'}; + our $osym = $vars{'instopt_path'}; our ($binlab,$binb,$manlab,$manb,$infolab,$infob); sub set_unset_buttons { $lbin = ($osym ? $vars{'option_sys_bin'} : ''); @@ -969,8 +969,8 @@ sub menu_select_symlink { $vars{'option_sys_info'} = $linfo; $vars{'option_sys_man'} = $lman; } - $vars{'option_path'} = $osym; - toggle_and_set_opt_variable(\$vars{'option_path'}, \$pathadjyesno); + $vars{'instopt_path'} = $osym; + toggle_and_set_opt_variable(\$vars{'instopt_path'}, \$pathadjyesno); } my $sw = $mainwindow->Toplevel( -title => __('Create symlinks in system directories')); @@ -1251,7 +1251,7 @@ sub toggle_portable { $tmflocalbutton, $tmfsysvarbutton, $tmfsysconfigbutton, $tmfhomebutton) { $b->configure(-state => 'disabled'); } - $vars{'option_path'} = 0; + $vars{'instopt_path'} = 0; $vars{'option_desktop_integration'} = 0; $vars{'option_file_assocs'} = 0; $vars{'option_w32_multi_user'} = 0; diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index 2d73ccaa5b3..9bbf802d16a 100644 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -758,7 +758,7 @@ sub help_menu { sub options_menu { - my $b_path=obutton($vars{'option_path'}); + my $b_path=obutton($vars{'instopt_path'}); my $b_doc=obutton($vars{'option_install_docfiles'}); my $b_src=obutton($vars{'option_install_srcfiles'}); my $b_fmt=obutton($vars{'option_create_formats'}); @@ -774,9 +774,9 @@ sub options_menu { my $sys_man=$vars{'option_sys_man'}; my $sys_info=$vars{'option_sys_info'}; - my $t_sys_bin=($vars{'option_path'})? $vars{'option_sys_bin'}:''; - my $t_sys_man=($vars{'option_path'})? $vars{'option_sys_man'}:''; - my $t_sys_info=($vars{'option_path'})? $vars{'option_sys_info'}:''; + my $t_sys_bin=($vars{'instopt_path'})? $vars{'option_sys_bin'}:''; + my $t_sys_man=($vars{'instopt_path'})? $vars{'option_sys_man'}:''; + my $t_sys_info=($vars{'instopt_path'})? $vars{'option_sys_info'}:''; my %command=( 'self' => \&options_menu, @@ -834,15 +834,15 @@ EOF other_options qw(R Q diskspace); my $answer = prompt 'Enter command'; - # option_path + # instopt_path if (unix()) { if (("\u$answer" eq 'L') and !$vars{'instopt_portable'}) { my $home = getenv('HOME'); $home = getenv('USERPROFILE') if (win32()); $home ||= '~'; - toggle 'option_path'; - if ($vars{'option_path'}) { + toggle 'instopt_path'; + if ($vars{'instopt_path'}) { print "New value for binary directory [$sys_bin]: "; chomp($answer=<STDIN>); $vars{'option_sys_bin'} = "$answer" if (length $answer); @@ -871,7 +871,7 @@ EOF my $home = getenv('HOME'); $home = getenv('USERPROFILE') if (win32()); $home ||= '~'; - toggle 'option_path'; + toggle 'instopt_path'; return $command{'self'}; } } @@ -963,13 +963,13 @@ sub toggle_portable { if ($vars{'instopt_portable'}) { $vars{'instopt_portable'} = 0; $vars{'option_desktop_integration'} = 0; - $vars{'option_path'} = 0; + $vars{'instopt_path'} = 0; $vars{'option_file_assocs'} = 0; $vars{'option_w32_multi_user'} = 0; } else { $vars{'instopt_portable'} = 1; $vars{'option_desktop_integration'} = 1; - $vars{'option_path'} = 1; + $vars{'instopt_path'} = 1; $vars{'option_file_assocs'} = 1; $vars{'option_w32_multi_user'} = 1; } @@ -987,7 +987,7 @@ sub callback_save_profile { sub main_menu { my $this_platform=platform_desc($vars{'this_platform'}); - my $b_path=button($vars{'option_path'}); + my $b_path=button($vars{'instopt_path'}); my $b_doc=button($vars{'option_install_docfiles'}); my $b_src=button($vars{'option_install_srcfiles'}); my $b_fmt=button($vars{'option_create_formats'}); diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index 6fee6de1954..29c588e3759 100644 --- a/Master/tlpkg/installer/install-menu-wizard.pl +++ b/Master/tlpkg/installer/install-menu-wizard.pl @@ -40,7 +40,7 @@ my %opts_to_str = ( "instopt_letter" => __("Default paper size"), "option_desktop_integration" => __("Add menu shortcuts"), "option_file_assocs" => __("Change file associations"), - "option_path" => __("Adjust PATH setting in registry"), + "instopt_path" => __("Adjust PATH setting in registry"), "option_w32_multi_user" => __("Installation for all users"), "collection-texworks" => __("Install TeXworks front end"), ); diff --git a/Master/tlpkg/installer/installer-options.txt b/Master/tlpkg/installer/installer-options.txt index 38e606d2cdb..a4c271b932f 100644 --- a/Master/tlpkg/installer/installer-options.txt +++ b/Master/tlpkg/installer/installer-options.txt @@ -49,7 +49,7 @@ option_post_code 1 option_sys_bin/man/info /u/l/... unix unix option("sys_bin") ... - unix link dests (if option_path == 1) + unix link dests (if instopt_path == 1) TLPDB add/remove_symlinks (via tlmgr action_symlinks and install-tl do_path_adjustments) @@ -65,7 +65,7 @@ instopt_letter 0 x x x use letter install-tl: sub do_postinst_stuff -option_path 0 unix/1 win x x +instopt_path 0 unix/1 win x x path adjustment not saved into the local TLPDB only for install time setting |