diff options
-rw-r--r-- | Master/texmf/scripts/texlive/uninstall-win32.pl | 2 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLWinGoo.pm | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Master/texmf/scripts/texlive/uninstall-win32.pl b/Master/texmf/scripts/texlive/uninstall-win32.pl index 7cd1bf5c979..8f14630f832 100644 --- a/Master/texmf/scripts/texlive/uninstall-win32.pl +++ b/Master/texmf/scripts/texlive/uninstall-win32.pl @@ -33,7 +33,7 @@ $f->pack(-padx => "10m", -pady => "5m"); my $ok = $f->Button(-text => "Ok", -command => sub { $mw->destroy; doit(); exit(0); }); my $cancel = $f->Button(-text => "Cancel", - -command => sub { $mw->destroy; exit(0); }); + -command => sub { $mw->destroy; exit(1); }); $ok->pack(-side => 'left', -padx => "3m"); $cancel->pack(-side => 'left' , -padx => "3m"); diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm index b82d417cf41..53c6da426ca 100644 --- a/Master/tlpkg/TeXLive/TLWinGoo.pm +++ b/Master/tlpkg/TeXLive/TLWinGoo.pm @@ -1005,6 +1005,7 @@ rem This should not be necessary, but sometimes it is: path $td\\bin\\win32;%path% set PERL5LIB= \"$td\\tlpkg\\tlperl\\bin\\perl.exe\" \"$td\\texmf\\scripts\\texlive\\uninstall-win32.pl\" +if errorlevel 1 exit call \"$tdw\\tlpkg\\installer\\unshort.bat\" copy \"$tdw\\tlpkg\\installer\\uninst2.bat\" \"\%TEMP\%\" rem pause @@ -1027,8 +1028,8 @@ rmdir /s /q \"$td\\bin\" rmdir /s /q \"$td\\tlpkg\" del /q \"$td\\README.*\" del /q \"$td\\LICENSE.*\" -del /q \"$td\\index.html\" -del /q \"$td\\texmf.cnf\" +del \"$td\\index.html\" +del \"$td\\texmf.cnf\" UNEND2 ; print UNINST2 <<UNEND2; @@ -1037,7 +1038,7 @@ rmdir /s /q \"$tdsc\" rmdir /s /q \"$tdw\\temp\" rmdir /s /q \"$tdw\\tlpkg\" del \"$tdw\\install-tl.log\" -del \"$tdw\\texlive.profile\" +del \"$tdw\\texlive.profile\" 2>nul del \"$tdw\\release-texlive.txt\" set test= for \%\%f in (\"$tdw\\*.*\") do \@set test=nonempty |