summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2008-04-20 16:40:13 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2008-04-20 16:40:13 +0000
commit22b90f2e28f750a9dcf3b3f67872a560c4f6d0f1 (patch)
tree6289980607085c5605356b098010e319809b0d8c /Master/tlpkg
parentf90831f6e47e7321ba5f1d9f75f847ba33764c81 (diff)
Win32 uninstaller: various fixes; now also works under Vista.
git-svn-id: svn://tug.org/texlive/trunk@7546 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLWinGoo.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index 5350a32bb7f..1948aa95727 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -452,7 +452,7 @@ sub unsetenv_reg {
my $env_var = shift;
my $env = get_user_env();
my $mode = @_ ? shift : "default";
- print "Unsetenv_reg: unset $env_var with mode $mode\n";
+ #print "Unsetenv_reg: unset $env_var with mode $mode\n";
die "unsetenv_reg: Invalid mode"
if ($mode ne "user" and $mode ne "system" and $mode ne "default");
die "unsetenv_reg: mode 'system' only available for admin"
@@ -852,9 +852,9 @@ sub create_uninstaller {
$td =~ s!/!\\!g;
my $uninst_key = $Registry -> Open((admin() ? "LMachine" : "CUser") .
- "/software/microsoft/windows/currentversion/uninstall/",
+ "/software/microsoft/windows/currentversion/",
{Access => KEY_ALL_ACCESS()});
- my $k = $uninst_key->CreateKey("TeXLive/");
+ my $k = $uninst_key->CreateKey("uninstall/TeXLive/");
$k->{"/DisplayName"} = "TeXLive ".$::texlive_release;
$k->{"/UninstallString"} = "\"$td\\tlpkg\\installer\\uninst.bat\"";
$k->{'/DisplayVersion'} = $::texlive_release;
@@ -870,7 +870,7 @@ set PERL5LIB=
copy \"$td\\tlpkg\\installer\\uninst2.bat\" \"\%TEMP\%\"
\"\%TEMP\%\\uninst2.bat\"
UNEND
-close UNEND;
+ close UNINST;
open UNINST2, ">$tdfw/tlpkg/installer/uninst2.bat";
print UNINST2 <<UNEND2;
@@ -879,9 +879,9 @@ rmdir /s /q \"$td\\texmf-doc\"
rmdir /s /q \"$td\\texmf-var\"
rmdir /s /q \"$td\\texmf-config\"
rmdir /s /q \"$td\\texmf\"
-rmdir /s /q \"$td\\tlpkg\"
rmdir /s /q \"$td\\temp\"
rmdir /s /q \"$td\\bin\"
+rmdir /s /q \"$td\\tlpkg\"
del \"$td\\install-tl.log\"
\@echo Done uninstalling TeXLive.
\@pause