summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLMedia.pm
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/TeXLive/TLMedia.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLMedia.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm
index 99eb234d896..3b72fa48b54 100644
--- a/Master/tlpkg/TeXLive/TLMedia.pm
+++ b/Master/tlpkg/TeXLive/TLMedia.pm
@@ -272,9 +272,12 @@ sub install_package {
if (win32() && admin() && !$totlpdb->option("w32_multi_user")) {
non_admin();
}
+ # for now desktop_integration maps to both installation
+ # of desktop shortcuts and menu items, but we can split them later
&TeXLive::TLUtils::do_postaction("install", $tlpobj,
$totlpdb->option("file_assocs"),
$totlpdb->option("desktop_integration"),
+ $totlpdb->option("desktop_integration"),
$totlpdb->option("post_code"));
}
}
@@ -489,7 +492,8 @@ sub remove_package {
if (defined($opts{'nopostinstall'}) && $opts{'nopostinstall'}) {
&TeXLive::TLUtils::do_postaction("remove", $tlp,
0, # option_file_assocs,
- 0, # option_desktop_integration,
+ 0, # option_desktop_integration, menu part
+ 0, # option_desktop_integration, desktop part
$localtlpdb->option("post_code"));
}
#
@@ -519,10 +523,12 @@ sub remove_package {
# Run the post installation code in the postaction tlpsrc entries
# the postaction code part cannot be evaluated now since the
# files are already removed.
+ # Again, desktop integration maps to desktop and menu links
if (!$nopostinstall) {
&TeXLive::TLUtils::do_postaction("remove", $tlp,
$localtlpdb->option("file_assocs"),
$localtlpdb->option("desktop_integration"),
+ $localtlpdb->option("desktop_integration"),
0);
}
}