diff options
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-x | Master/install-tl | 24 |
1 files changed, 12 insertions, 12 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_>) |