summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-03-19 16:46:18 +0000
committerNorbert Preining <preining@logic.at>2008-03-19 16:46:18 +0000
commit3f9fa30dcf7d0a12156693781d9277384ae29c35 (patch)
tree66e8534fdcefd6606f62718c7176e3f46299e9de
parent79a8a1ffc37784a6699a8a9e6f7427b4e00af605 (diff)
more work on the uninstaller ...
git-svn-id: svn://tug.org/texlive/trunk@7027 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/installer/uninstall-tl.bat8
-rwxr-xr-xMaster/tlpkg/installer/uninstall-tl.pl9
2 files changed, 16 insertions, 1 deletions
diff --git a/Master/tlpkg/installer/uninstall-tl.bat b/Master/tlpkg/installer/uninstall-tl.bat
index b33fefde5cd..4f149d7c0f3 100755
--- a/Master/tlpkg/installer/uninstall-tl.bat
+++ b/Master/tlpkg/installer/uninstall-tl.bat
@@ -14,6 +14,14 @@ set PERL5SAVE=%PERL5LIB%
set PERL5LIB=%tlsub%..\tlperl\lib
"%tlsub%..\tlperl\bin\perl" "%~dpn0.pl" %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+rem remove files that are in use by the perl un-installer
+rmdir /s /q %tlsub%..\tlperl
+rmdir /s /q %tlsub%..\..\temp
+del /q %tlsub%..\texlive.tlpdb
+cd %tlsub%..\..
+rmdir /s /q tlpkg
+del /q install-tl.log
rem pause Done
rem cleanup in case of start from command-line
diff --git a/Master/tlpkg/installer/uninstall-tl.pl b/Master/tlpkg/installer/uninstall-tl.pl
index 4d15ebca19c..0f4fcecfe83 100755
--- a/Master/tlpkg/installer/uninstall-tl.pl
+++ b/Master/tlpkg/installer/uninstall-tl.pl
@@ -79,8 +79,15 @@ sub main
system("rmdir /s /q \"$Master\\texmf-config\"");
system("rmdir /s /q \"$Master\\texmf\"");
system("rmdir /s /q \"$Master\\bin\"");
- system("rmdir /s /q \"$Master\\tlpkg\"");
system("del /q \"$Master\\install-tl.log\"");
+ # that cannot be removed that easily, some files are in use ...
+ # so we move that to the .bat file
+ # tlpkg\bin\uninstall-tl.pl
+ # tlpkg\bin
+ # tlpkg\texlive.tlpdb
+ # tlpkg\tlperl\bin
+ # tlpkg\tlperl\lib
+ #system("rmdir /s /q \"$Master\\tlpkg\"");
# now everything should be removed ...
system("rmdir /q \"$Master\"");
} else {