summaryrefslogtreecommitdiff
path: root/Master/texmf/scripts/texlive/uninstall-win32.pl
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf/scripts/texlive/uninstall-win32.pl')
-rw-r--r--Master/texmf/scripts/texlive/uninstall-win32.pl13
1 files changed, 9 insertions, 4 deletions
diff --git a/Master/texmf/scripts/texlive/uninstall-win32.pl b/Master/texmf/scripts/texlive/uninstall-win32.pl
index 01b7a85a4b5..cfc3ff9bee1 100644
--- a/Master/texmf/scripts/texlive/uninstall-win32.pl
+++ b/Master/texmf/scripts/texlive/uninstall-win32.pl
@@ -49,17 +49,22 @@ sub doit {
if (!defined($localtlpdb)) {
tlwarn("Cannot load the TLPDB from $Master, are you sure there is an installation?\n");
} else {
+ # set the mode for windows uninstall according to the setting in
+ # tlpdb
+ if (TeXLive::TLWinGoo::admin() && !$localtlpdb->option("w32_multi_user")) {
+ non_admin();
+ }
for my $pkg ($localtlpdb->list_packages) {
&TeXLive::TLUtils::do_postaction("remove", $localtlpdb->get_package($pkg),
- $localtlpdb->option_file_assocs,
- $localtlpdb->option_desktop_integration,
- $localtlpdb->option_post_code);
+ $localtlpdb->option("file_assocs"),
+ $localtlpdb->option("desktop_integration"),
+ $localtlpdb->option("post_code"));
}
}
my $menupath = &TeXLive::TLWinGoo::menu_path();
$menupath =~ s!/!\\!g;
`rmdir /q "$menupath\\$TeXLive::TLConfig::WindowsMainMenuName" 2>nul`;
- my $mode = ($localtlpdb->option_w32_multi_user) ? 'system' : 'user';
+ my $mode = ($localtlpdb->option("w32_multi_user")) ? 'system' : 'user';
adjust_reg_path_for_texlive('remove', "$Master/bin/win32", $mode);
# unsetenv_reg("TEXBINDIR");
# from_dvd case: