summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2008-04-19 21:05:04 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2008-04-19 21:05:04 +0000
commitc218373fa03fe30ccb9fcc9594ff60dba4e4d6d4 (patch)
treed023ea65bec3fb3d9bccb2ca4d678ef90c42a119
parentadaff86c5d8f17de3bbe5014dda0c5fdf2752f4a (diff)
Win32 uninstaller now asks for confirmation. Manifest file for Vista.
git-svn-id: svn://tug.org/texlive/trunk@7536 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/install-tl.bat.manifest15
-rw-r--r--Master/tlpkg/TeXLive/TLWinGoo.pm6
2 files changed, 21 insertions, 0 deletions
diff --git a/Master/install-tl.bat.manifest b/Master/install-tl.bat.manifest
new file mode 100644
index 00000000000..db23e0e8c8e
--- /dev/null
+++ b/Master/install-tl.bat.manifest
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity
+ version="1.0.0.0"
+ processorArchitecture="*"
+ name="install-tl"
+ type="win32"/>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+</assembly>
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index e4d5fa5c0b4..5350a32bb7f 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -847,6 +847,7 @@ the job.
sub create_uninstaller {
my $tdfw = shift;
+ $tdfw =~ s![\\/]$!!;
my $td = $tdfw;
$td =~ s!/!\\!g;
@@ -861,6 +862,9 @@ sub create_uninstaller {
open UNINST, ">$tdfw/tlpkg/installer/uninst.bat";
print UNINST <<UNEND;
+\@echo off
+echo Do you really want to remove TeX Live 2008? Type Ctrl-C to abort.
+pause
set PERL5LIB=
\"$td\\tlpkg\\tlperl\\bin\\perl.exe\" \"$td\\texmf\\scripts\\texlive\\uninstall-tl.pl\"
copy \"$td\\tlpkg\\installer\\uninst2.bat\" \"\%TEMP\%\"
@@ -879,6 +883,8 @@ rmdir /s /q \"$td\\tlpkg\"
rmdir /s /q \"$td\\temp\"
rmdir /s /q \"$td\\bin\"
del \"$td\\install-tl.log\"
+\@echo Done uninstalling TeXLive.
+\@pause
del %0
UNEND2
close UNINST2;