summaryrefslogtreecommitdiff
path: root/Master/texmf
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2010-09-10 14:57:40 +0000
committerNorbert Preining <preining@logic.at>2010-09-10 14:57:40 +0000
commit75030959fe7e9e18a4237090b4173052d10e1740 (patch)
tree4a722e5572b8f233674dccdd4e6ed40ad3ab6374 /Master/texmf
parent6e00b8d5b304a09a59b4e7d2fa2535dbd831af7e (diff)
tlmgr/installer: allow separating options for desktop shortcuts and
menu shortcuts. Currently the installer option "desktop_integration" maps to both menu shortcuts and desktop shortcuts. With this change we can make that two independent options. git-svn-id: svn://tug.org/texlive/trunk@19639 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl7
-rw-r--r--Master/texmf/scripts/texlive/uninstall-win32.pl1
2 files changed, 5 insertions, 3 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 0d939e5297f..5718438d16e 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -4009,7 +4009,8 @@ sub action_postaction {
if (!defined($tlp)) {
tlwarn("$p is not installed, ignoring it.\n");
} else {
- TeXLive::TLUtils::do_postaction($how, $tlp, 0, 1, 0);
+ # run all shortcut actions, desktop and menu integration
+ TeXLive::TLUtils::do_postaction($how, $tlp, 0, 1, 1, 0);
}
}
} elsif ($type =~ m/^fileassoc$/i) {
@@ -4030,7 +4031,7 @@ sub action_postaction {
if (!defined($tlp)) {
tlwarn("$p is not installed, ignoring it.\n");
} else {
- TeXLive::TLUtils::do_postaction($how, $tlp, $fa, 0, 0);
+ TeXLive::TLUtils::do_postaction($how, $tlp, $fa, 0, 0, 0);
}
}
} elsif ($type =~ m/^script$/i) {
@@ -4039,7 +4040,7 @@ sub action_postaction {
if (!defined($tlp)) {
tlwarn("$p is not installed, ignoring it.\n");
} else {
- TeXLive::TLUtils::do_postaction($how, $tlp, 0, 0, 1);
+ TeXLive::TLUtils::do_postaction($how, $tlp, 0, 0, 0, 1);
}
}
} else {
diff --git a/Master/texmf/scripts/texlive/uninstall-win32.pl b/Master/texmf/scripts/texlive/uninstall-win32.pl
index 8f81f9e9bfd..2b96b41e29b 100644
--- a/Master/texmf/scripts/texlive/uninstall-win32.pl
+++ b/Master/texmf/scripts/texlive/uninstall-win32.pl
@@ -58,6 +58,7 @@ sub doit {
&TeXLive::TLUtils::do_postaction("remove", $localtlpdb->get_package($pkg),
$localtlpdb->option("file_assocs"),
$localtlpdb->option("desktop_integration"),
+ $localtlpdb->option("desktop_integration"),
$localtlpdb->option("post_code"));
}
}