diff options
Diffstat (limited to 'Master')
| -rwxr-xr-x | Master/install-tl | 24 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 2 | ||||
| -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 |
6 files changed, 33 insertions, 33 deletions
diff --git a/Master/install-tl b/Master/install-tl index e3e3469e2db..d7c96322204 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -147,7 +147,7 @@ our %vars=( # 'n_' means 'number of'. 'instopt_letter' => 0, 'instopt_adjustrepo' => 1, 'instopt_write18_restricted' => 1, - 'instopt_path' => 0, + 'instopt_adjustpath' => 0, ); my %path_keys = ( @@ -744,7 +744,7 @@ sub final_remote_init { } $opt_scheme = "" if $opt_in_place; $vars{'instopt_portable'} = $opt_portable; - $vars{'instopt_path'} = 1 if win32(); + $vars{'instopt_adjustpath'} = 1 if win32(); log("Installer revision: $::installerrevision\n"); log("Database revision: " . $tlpdb->config_revision . "\n"); @@ -782,7 +782,7 @@ sub do_installation { $vars{'tlpdbopt_desktop_integration'} = 0; $vars{'tlpdbopt_menu_integration'} = 0; $vars{'tlpdbopt_file_assocs'} = 0; - $vars{'instopt_path'} = 0; + $vars{'instopt_adjustpath'} = 0; $vars{'tlpdbopt_w32_multi_user'} = 0; } if ($vars{'selected_scheme'} ne "scheme-infraonly" @@ -1065,7 +1065,7 @@ operations might be disturbed.\n\n"; # option settings in launcher.ini if (win32() && !$vars{'instopt_portable'}) { - if ($vars{'tlpdbopt_file_assocs'} != 1 || !$vars{'instopt_path'}) { + if ($vars{'tlpdbopt_file_assocs'} != 1 || !$vars{'instopt_adjustpath'}) { # create higher priority tlaunch.ini with adjusted settings # whether or not launcher mode (desktop integration 2) # was selected @@ -1109,7 +1109,7 @@ operations might be disturbed.\n\n"; # for portable, this option should be unset # it should not be necessary to test separately for portable do_path_adjustments() if - $vars{'instopt_path'} and $vars{tlpdbopt_desktop_integration} != 2; + $vars{'instopt_adjustpath'} and $vars{tlpdbopt_desktop_integration} != 2; # now do the system integration: # on unix this means setting up symlinks @@ -1178,7 +1178,7 @@ sub rewrite_tlaunch_ini { print OUT $ini; print OUT "[General]"; print OUT "FILETYPES=$fts[$vars{'tlpdbopt_file_assocs'}]"; - print OUT "SEARCHPATH=$vars{'instopt_path'}\n"; + print OUT "SEARCHPATH=$vars{'instopt_adjustpath'}\n"; close OUT; `mktexlsr $tmfsysvar`; } else { @@ -1801,7 +1801,7 @@ sub read_profile { 'option_doc' => 'tlpdbopt_install_docfiles', 'option_src' => 'tlpdbopt_install_srcfiles', 'option_fmt' => 'tlpdbopt_create_formats', - 'option_path' => 'instopt_path', + 'option_path' => 'instopt_adjustpath', 'option_letter' => 'instopt_letter', 'option_adjustrepo' => 'instopt_adjustrepo', 'portable' => 'instopt_portable', @@ -1907,7 +1907,7 @@ sub read_profile { # helper subroutine to do sanity check of options before installation sub sanitise_options { # portable option overrides any system integration options - $vars{'instopt_path'} = 0 if $vars{'instopt_portable'}; + $vars{'instopt_adjustpath'} = 0 if $vars{'instopt_portable'}; $vars{'tlpdbopt_file_assocs'} = 0 if $vars{'instopt_portable'}; $vars{'tlpdbopt_desktop_integration'} = 0 if $vars{'instopt_portable'}; } # sanitise_options @@ -2100,11 +2100,11 @@ sub import_settings_from_old_tlpdb { $previoustlpdb->option_pkg("00texlive.installation", "create_formats"); $vars{'tlpdbopt_desktop_integration'} = 1 if win32(); - $vars{'instopt_path'} = + $vars{'instopt_adjustpath'} = $previoustlpdb->option_pkg("00texlive.installation", "path"); - $vars{'instopt_path'} = 0 if !defined($vars{'instopt_path'}); - $vars{'instopt_path'} = 1 if win32(); + $vars{'instopt_adjustpath'} = 0 if !defined($vars{'instopt_adjustpath'}); + $vars{'instopt_adjustpath'} = 1 if win32(); $vars{'tlpdbopt_sys_bin'} = $previoustlpdb->option_pkg("00texlive.installation", "sys_bin"); @@ -2687,7 +2687,7 @@ C<instopt_adjustrepo> (default 1, adjust remote repository to CTAN mirror after installation), C<instopt_write18_restricted> (default 1, enable write8 for a restricted set of programs), -C<instopt_path> (default 0 on Unix, 1 on Windows, adjust PATH environment). +C<instopt_adjustpath> (default 0 on Unix, 1 on Windows, adjust PATH environment). =item B<tlpdb options> (those with prefix C<tlpdbopt_>) diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index 05ee6d5e099..be8ca33de10 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -124,7 +124,7 @@ tlpdbopt_install_docfiles 1 tlpdbopt_install_srcfiles 1 tlpdbopt_create_formats 1 instopt_letter 0 -instopt_path 0 +instopt_adjustpath 0 instopt_adjustrepo 0 " >texlive.profile diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 9733009886a..2d5cc3a3e62 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{'tlpdbopt_create_formats'}]; $srcyesno = $::yesno[$vars{'tlpdbopt_install_srcfiles'}]; $deskintyesno = $::deskintdesc[$vars{'tlpdbopt_desktop_integration'}]; - $pathadjyesno = $::yesno[$vars{'instopt_path'}]; + $pathadjyesno = $::yesno[$vars{'instopt_adjustpath'}]; $fileassocyesno = $::fileassocdesc[$vars{'tlpdbopt_file_assocs'}]; $editoryesno = $::yesno[$vars{'collection-texworks'}]; $adminallyesno = $::yesno[$vars{'tlpdbopt_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{'instopt_path'}, \$pathadjyesno); }); + toggle_and_set_opt_variable(\$vars{'instopt_adjustpath'}, \$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{'instopt_path'}; + our $osym = $vars{'instopt_adjustpath'}; our ($binlab,$binb,$manlab,$manb,$infolab,$infob); sub set_unset_buttons { $lbin = ($osym ? $vars{'tlpdbopt_sys_bin'} : ''); @@ -969,8 +969,8 @@ sub menu_select_symlink { $vars{'tlpdbopt_sys_info'} = $linfo; $vars{'tlpdbopt_sys_man'} = $lman; } - $vars{'instopt_path'} = $osym; - toggle_and_set_opt_variable(\$vars{'instopt_path'}, \$pathadjyesno); + $vars{'instopt_adjustpath'} = $osym; + toggle_and_set_opt_variable(\$vars{'instopt_adjustpath'}, \$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{'instopt_path'} = 0; + $vars{'instopt_adjustpath'} = 0; $vars{'tlpdbopt_desktop_integration'} = 0; $vars{'tlpdbopt_file_assocs'} = 0; $vars{'tlpdbopt_w32_multi_user'} = 0; diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index 2f6ae6d42d5..b7c1dba2e43 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{'instopt_path'}); + my $b_path=obutton($vars{'instopt_adjustpath'}); my $b_doc=obutton($vars{'tlpdbopt_install_docfiles'}); my $b_src=obutton($vars{'tlpdbopt_install_srcfiles'}); my $b_fmt=obutton($vars{'tlpdbopt_create_formats'}); @@ -774,9 +774,9 @@ sub options_menu { my $sys_man=$vars{'tlpdbopt_sys_man'}; my $sys_info=$vars{'tlpdbopt_sys_info'}; - my $t_sys_bin=($vars{'instopt_path'})? $vars{'tlpdbopt_sys_bin'}:''; - my $t_sys_man=($vars{'instopt_path'})? $vars{'tlpdbopt_sys_man'}:''; - my $t_sys_info=($vars{'instopt_path'})? $vars{'tlpdbopt_sys_info'}:''; + my $t_sys_bin=($vars{'instopt_adjustpath'})? $vars{'tlpdbopt_sys_bin'}:''; + my $t_sys_man=($vars{'instopt_adjustpath'})? $vars{'tlpdbopt_sys_man'}:''; + my $t_sys_info=($vars{'instopt_adjustpath'})? $vars{'tlpdbopt_sys_info'}:''; my %command=( 'self' => \&options_menu, @@ -834,15 +834,15 @@ EOF other_options qw(R Q diskspace); my $answer = prompt 'Enter command'; - # instopt_path + # instopt_adjustpath if (unix()) { if (("\u$answer" eq 'L') and !$vars{'instopt_portable'}) { my $home = getenv('HOME'); $home = getenv('USERPROFILE') if (win32()); $home ||= '~'; - toggle 'instopt_path'; - if ($vars{'instopt_path'}) { + toggle 'instopt_adjustpath'; + if ($vars{'instopt_adjustpath'}) { print "New value for binary directory [$sys_bin]: "; chomp($answer=<STDIN>); $vars{'tlpdbopt_sys_bin'} = "$answer" if (length $answer); @@ -871,7 +871,7 @@ EOF my $home = getenv('HOME'); $home = getenv('USERPROFILE') if (win32()); $home ||= '~'; - toggle 'instopt_path'; + toggle 'instopt_adjustpath'; return $command{'self'}; } } @@ -963,13 +963,13 @@ sub toggle_portable { if ($vars{'instopt_portable'}) { $vars{'instopt_portable'} = 0; $vars{'tlpdbopt_desktop_integration'} = 0; - $vars{'instopt_path'} = 0; + $vars{'instopt_adjustpath'} = 0; $vars{'tlpdbopt_file_assocs'} = 0; $vars{'tlpdbopt_w32_multi_user'} = 0; } else { $vars{'instopt_portable'} = 1; $vars{'tlpdbopt_desktop_integration'} = 1; - $vars{'instopt_path'} = 1; + $vars{'instopt_adjustpath'} = 1; $vars{'tlpdbopt_file_assocs'} = 1; $vars{'tlpdbopt_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{'instopt_path'}); + my $b_path=button($vars{'instopt_adjustpath'}); my $b_doc=button($vars{'tlpdbopt_install_docfiles'}); my $b_src=button($vars{'tlpdbopt_install_srcfiles'}); my $b_fmt=button($vars{'tlpdbopt_create_formats'}); diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index 4628536c2a9..dd58e0edd66 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"), "tlpdbopt_desktop_integration" => __("Add menu shortcuts"), "tlpdbopt_file_assocs" => __("Change file associations"), - "instopt_path" => __("Adjust PATH setting in registry"), + "instopt_adjustpath" => __("Adjust PATH setting in registry"), "tlpdbopt_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 4785804ee14..8ea6eed42ae 100644 --- a/Master/tlpkg/installer/installer-options.txt +++ b/Master/tlpkg/installer/installer-options.txt @@ -49,7 +49,7 @@ tlpdbopt_post_code 1 tlpdbopt_sys_bin/man/info /u/l/... unix unix option("sys_bin") ... - unix link dests (if instopt_path == 1) + unix link dests (if instopt_adjustpath == 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 -instopt_path 0 unix/1 win x x +instopt_adjustpath 0 unix/1 win x x path adjustment not saved into the local TLPDB only for install time setting |