diff options
Diffstat (limited to 'Master/install-tl')
| -rwxr-xr-x | Master/install-tl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Master/install-tl b/Master/install-tl index 1f168c4166f..98932f7b961 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -965,13 +965,11 @@ sub do_tlpdb_postactions { # option settings already reflect portable- and in_place options. my $usedtlpdb = $vars{'in_place'} ? $tlpdb : $localtlpdb; - # For now the option_desktop_integrations maps to both desktop - # and menu entries, but we can split that later foreach my $package ($usedtlpdb->list_packages) { &TeXLive::TLUtils::do_postaction("install", $usedtlpdb->get_package($package), $vars{'option_file_assocs'}, - $vars{'option_desktop_integration'}, + $vars{'option_menu_integration'}, $vars{'option_desktop_integration'}, $vars{'option_post_code'}); } @@ -1395,6 +1393,9 @@ END_EXPLICIT_MIRROR && ($tlpdb->option("paper") eq "letter" ? 1 : 0); $vars{'option_desktop_integration'} = $tlpdb->option("desktop_integration"); $vars{'option_desktop_integration'} = 1 if win32(); + # we unconditionally set the menu integration, this will be done in all + # cases but portable use, where we sanitize it away + $vars{'option_menu_integration'} = 1; $vars{'option_path'} = $tlpdb->option("path"); $vars{'option_path'} = 0 if !defined($vars{'option_path'}); $vars{'option_path'} = 1 if win32(); @@ -1580,6 +1581,7 @@ sub sanitise_options { $vars{'option_path'} &&= !$vars{'portable'}; $vars{'option_file_assocs'} &&= !$vars{'portable'}; $vars{'option_desktop_integration'} &&= !$vars{'portable'}; + $vars{'option_menu_integration'} &&= !$vars{'portable'}; } sub do_install_packages { @@ -1710,6 +1712,7 @@ sub import_settings_from_old_tlpdb { $previoustlpdb->option_pkg("00texlive.installation", "create_formats"); $vars{'option_desktop_integration'} = 1 if win32(); + $vars{'option_menu_integration'} = 1 if win32(); $vars{'option_path'} = $previoustlpdb->option_pkg("00texlive.installation", "path"); |