diff options
| author | Siep Kroonenberg <siepo@cybercomm.nl> | 2011-06-24 10:14:59 +0000 |
|---|---|---|
| committer | Siep Kroonenberg <siepo@cybercomm.nl> | 2011-06-24 10:14:59 +0000 |
| commit | ce1d18a9161f915e6ffc2eb1ca60677972fd03be (patch) | |
| tree | db72836b67ba04980dca8276bb856ac901fc20bf | |
| parent | a15be8125e452f91bf75d2761747638ee386b5d7 (diff) | |
W32 uninstaller: stop tray menu first
git-svn-id: svn://tug.org/texlive/trunk@23123 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Master/tlpkg/TeXLive/TLWinGoo.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm index eef79f43411..b4300ce5180 100644 --- a/Master/tlpkg/TeXLive/TLWinGoo.pm +++ b/Master/tlpkg/TeXLive/TLWinGoo.pm @@ -1194,11 +1194,13 @@ sub create_uninstaller { print UNINST <<UNEND; \@echo off setlocal -rem This should not be necessary, but sometimes it is: path $td\\tlpkg\\tlperl\\bin;$td\\bin\\win32;%path% set PERL5LIB=$td\\tlpkg\\tlperl\\lib perl.exe \"$td\\texmf\\scripts\\texlive\\uninstall-win32.pl\" if errorlevel 1 goto :eof +rem test for taskkill and try to stop exit tray menu +taskkill /? >nul 2>&1 +if not errorlevel 1 1>nul 2>&1 taskkill /IM tl-tray-menu.exe /f copy \"$td\\tlpkg\\installer\\uninst2.bat\" \"\%TEMP\%\" rem pause \"\%TEMP\%\\uninst2.bat\" @@ -1216,7 +1218,7 @@ UNEND rmdir /s /q \"$td\\bin\" rmdir /s /q \"$td\\readme-html.dir\" rmdir /s /q \"$td\\readme-txt.dir\" -rmdir /s /q \"$td\\temp\" +if exist \"$td\\temp\" rmdir /s /q \"$td\\temp\" rmdir /s /q \"$td\\texmf\" rmdir /s /q \"$td\\texmf-dist\" rmdir /s /q \"$td\\tlpkg\" @@ -1224,7 +1226,7 @@ rmdir /s /q \"$tdsc\" rmdir /s /q \"$tdsv\" del /q \"$td\\README.*\" del /q \"$td\\LICENSE.*\" -del /q \"$td\\doc.html\" +if exist \"$td\\doc.html\" del /q \"$td\\doc.html\" del /q \"$td\\index.html\" del /q \"$td\\texmf.cnf\" del /q \"$td\\texmfcnf.lua\" |