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/install-tl | |
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/install-tl')
-rwxr-xr-x | Master/install-tl | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/Master/install-tl b/Master/install-tl index c505da28b74..7c36957b532 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -127,7 +127,6 @@ our @collections_std; # $tlpdb->option_XXXXX # settings (i.e., taken from tlpkg/tlpsrc/00texlive.installation.tlpsrc # -# 'option_path' => 0, # 'option_sys_bin' => '/usr/local/bin', # 'option_sys_man' => '/usr/local/man', # 'option_sys_info' => '/usr/local/info', @@ -148,6 +147,7 @@ our %vars=( # 'n_' means 'number of'. 'instopt_letter' => 0, 'instopt_adjustrepo' => 1, 'instopt_write18_restricted' => 1, + 'instopt_path' => 0, ); # option handling @@ -733,6 +733,7 @@ sub final_remote_init { } $opt_scheme = "" if $opt_in_place; $vars{'instopt_portable'} = $opt_portable; + $vars{'instopt_path'} = 1 if win32(); log("Installer revision: $::installerrevision\n"); log("Database revision: " . $tlpdb->config_revision . "\n"); @@ -770,7 +771,7 @@ sub do_installation { $vars{'option_desktop_integration'} = 0; $vars{'option_menu_integration'} = 0; $vars{'option_file_assocs'} = 0; - $vars{'option_path'} = 0; + $vars{'instopt_path'} = 0; $vars{'option_w32_multi_user'} = 0; } if ($vars{'selected_scheme'} ne "scheme-infraonly" @@ -1053,7 +1054,7 @@ operations might be disturbed.\n\n"; # option settings in launcher.ini if (win32() && !$vars{'instopt_portable'}) { - if ($vars{'option_file_assocs'} != 1 || !$vars{'option_path'}) { + if ($vars{'option_file_assocs'} != 1 || !$vars{'instopt_path'}) { # create higher priority tlaunch.ini with adjusted settings # whether or not launcher mode (desktop integration 2) # was selected @@ -1097,7 +1098,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{'option_path'} and $vars{option_desktop_integration} != 2; + $vars{'instopt_path'} and $vars{option_desktop_integration} != 2; # now do the system integration: # on unix this means setting up symlinks @@ -1166,7 +1167,7 @@ sub rewrite_tlaunch_ini { print OUT $ini; print OUT "[General]"; print OUT "FILETYPES=$fts[$vars{'option_file_assocs'}]"; - print OUT "SEARCHPATH=$vars{'option_path'}\n"; + print OUT "SEARCHPATH=$vars{'instopt_path'}\n"; close OUT; `mktexlsr $tmfsysvar`; } else { @@ -1625,9 +1626,6 @@ END_EXPLICIT_MIRROR # in portable case, shortcuts sanitized away elsewhere $vars{'option_desktop_integration'} = $tlpdb->option("desktop_integration"); $vars{'option_desktop_integration'} = 1 if win32(); - $vars{'option_path'} = $tlpdb->option("path"); - $vars{'option_path'} = 0 if !defined($vars{'option_path'}); - $vars{'option_path'} = 1 if win32(); $vars{'option_w32_multi_user'} = $tlpdb->option("w32_multi_user"); # we have to make sure that this option is set to 0 in case # that a non-admin is running the installations program @@ -1837,7 +1835,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{'option_path'} = 0 if $vars{'instopt_portable'}; + $vars{'instopt_path'} = 0 if $vars{'instopt_portable'}; $vars{'option_file_assocs'} = 0 if $vars{'instopt_portable'}; $vars{'option_desktop_integration'} = 0 if $vars{'instopt_portable'}; } # sanitise_options @@ -2041,11 +2039,11 @@ sub import_settings_from_old_tlpdb { $previoustlpdb->option_pkg("00texlive.installation", "create_formats"); $vars{'option_desktop_integration'} = 1 if win32(); - $vars{'option_path'} = + $vars{'instopt_path'} = $previoustlpdb->option_pkg("00texlive.installation", "path"); - $vars{'option_path'} = 0 if !defined($vars{'option_path'}); - $vars{'option_path'} = 1 if win32(); + $vars{'instopt_path'} = 0 if !defined($vars{'instopt_path'}); + $vars{'instopt_path'} = 1 if win32(); $vars{'option_sys_bin'} = $previoustlpdb->option_pkg("00texlive.installation", "sys_bin"); |