From 2407a8e8d45b2a8d3014ed952b612821656da561 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Thu, 26 Apr 2012 13:25:42 +0200
Subject: [PATCH] correct uninstall

---
 CLIENT_DATA/config.xml   | 2 +-
 CLIENT_DATA/delsub32.ins | 3 ++-
 CLIENT_DATA/setup32.ins  | 7 +++++++
 ReadMe.txt               | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 ReadMe.txt

diff --git a/CLIENT_DATA/config.xml b/CLIENT_DATA/config.xml
index 18da33b..485ee27 100644
--- a/CLIENT_DATA/config.xml
+++ b/CLIENT_DATA/config.xml
@@ -1,6 +1,6 @@
 <Configuration Product="SmallBusinessr">
 
-	<Display Level="None" CompletionNotice="no" SuppressModal="no" AcceptEula="yes" />
+	<Display Level="Basic" CompletionNotice="no" SuppressModal="Yes" AcceptEula="yes" />
 	
 	<!-- <Logging Type="standard" Path="%temp%" Template="Microsoft Office Small Business Setup(*).txt" /> -->
 	
diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index 5ae3de0..0fc9e8f 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -24,7 +24,8 @@ comment "Delete program shortcuts"
 LinkFolder_uninstall
 
 [Winbatch_uninstall_msi]
-msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
+;msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
+"%SystemDrive%\MSOCache\All Users\$MsiId$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall SmallBusinessr
 
 [Files_uninstall]
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 9e9794b..c455208 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -78,6 +78,10 @@ else
 	Winbatch_install
 	Sub_check_exitcode
 	
+	comment "Remove Install Files"
+	Winbatch_remove
+	Sub_check_exitcode
+	
 	comment "Copy files"
 	Files_install /32Bit
 	
@@ -110,6 +114,9 @@ xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/U
 [Winbatch_install]
 "$LogDir$\msoffice2007\SETUP.EXE" /config "$LogDir$\msoffice2007.xml"
 
+[Winbatch_remove]
+delete -sf "$LogDir$\msoffice2007"
+
 [Files_install]
 ; Example of recursively copying some files into the installation directory:
 ;
diff --git a/ReadMe.txt b/ReadMe.txt
new file mode 100644
index 0000000..94da8cc
--- /dev/null
+++ b/ReadMe.txt
@@ -0,0 +1 @@
+This Package requires the MSOCache to be in Std Location %SystemDrive%