W32 uninstaller: warn about running programs

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

1 files changed, 14 insertions, 11 deletions

diff --git a/Master/texmf/scripts/texlive/uninstall-win32.pl b/Master/texmf/scripts/texlive/uninstall-win32.pl
index 9950613234c..f157d0a60ba 100644
--- a/Master/texmf/scripts/texlive/uninstall-win32.pl
+++ b/Master/texmf/scripts/texlive/uninstall-win32.pl
@@ -23,21 +23,26 @@ use Tk::Dialog;
 
 my $mw = MainWindow->new(-title => "remove tlmgr 2011");
 
-my $lab = $mw->Label(-justify    => 'left',
-                     -text => "Do you really want to remove TeX Live 2011?");
-
-$lab->pack(-padx => "10m", -pady => "5m");
-
 my $f = $mw->Frame;
-$f->pack(-padx => "10m", -pady => "5m");
+my $lab = $f->Label(
+# -justify    => 'left',
+  -text => "Do you really want to remove TeX Live 2011?");
+$lab->pack(-side => "left", -padx => "12", -pady => "6");
+
+$f->pack(# -padx => "10m",
+  -pady => "12");
 
 my $ok = $f->Button(-text => "Ok",
                     -command => sub { $mw->destroy; doit(); exit(0); });
 my $cancel = $f->Button(-text => "Cancel",
                         -command => sub { $mw->destroy; exit(1); });
 
-$ok->pack(-side => 'left', -padx => "3m");
-$cancel->pack(-side => 'left' , -padx => "3m");
+$cancel->pack(-side => 'right' , -padx => "12");
+$ok->pack(-side => 'right', -padx => "12");
+
+$mw->Label(
+  -text => "Please make sure that no TeX Live programs are still running!"
+)->pack(-padx => "12", -pady => "12");
 
 sub doit {
   # first we remove the whole bunch of shortcuts and menu entries
@@ -68,11 +73,9 @@ sub doit {
     $localtlpdb->option("w32_multi_user"));
 
   # unsetenv_reg("TEXBINDIR");
-  # from_dvd case:
   # unsetenv_reg("TEXMFSYSVAR");
-  unsetenv_reg("TEXMFCNF");
+  # unsetenv_reg("TEXMFCNF");
   unregister_uninstaller($localtlpdb->option("w32_multi_user"));
-  # exit if is_vista();
   broadcast_env();
   update_assocs();
 }