Win32 uninstall via add/remove programs now mostly works.

git-svn-id: svn://tug.org/texlive/trunk@7516 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 3 insertions, 3 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 83973e7d867..c977ba387d8 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -43,7 +43,7 @@ BEGIN {
 }
 
 use TeXLive::TLUtils qw(initialize_installer media platform platform_desc
-   which getenv win32 unix program_exists 
+   which getenv win32 unix program_exists
    get_system_tmpdir member
    mkdirhier make_var_skeleton make_local_skeleton install_package copy
    install_packages dirname tllog setup_programs);
@@ -75,7 +75,7 @@ if (win32) {
     &unregister_script_type
     &broadcast_env
     &update_assocs
-    &register_uninstaller
+    &create_uninstaller
   ));
 }
 use Getopt::Long;
@@ -422,6 +422,7 @@ sub do_installation {
   do_install_packages();
   if (win32()) {
     do_win_registry_magic();
+    create_uninstaller($vars{'TEXDIR'});
   }
   foreach my $h (@::start_postinst_hook) {
     &$h();
@@ -1034,7 +1035,6 @@ sub do_win_registry_magic {
   register_script_type(".texlua", "%TEXBINDIR%/texlua.exe");
   broadcast_env();
   update_assocs();
-  register_uninstaller("$vars{'TEXDIR'}") unless $opt_portable;
 }
 
 #