From 367edd2283b412b31f020d26053610524f54e460 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sun, 26 Jun 2011 13:29:59 +0200
Subject: [PATCH] disable uninstall not working

---
 CLIENT_DATA/setup32.ins     | 12 ++++++------
 CLIENT_DATA/uninstall32.ins |  8 ++++----
 build.sh                    |  2 +-
 readme                      |  4 ++++
 todo                        |  6 ++++++
 5 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 readme
 create mode 100644 todo

diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 69582ca..ed091f4 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -41,10 +41,10 @@ else
 	comment "Show product picture"
 	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
 	
-	if FileExists("%ScriptPath%\delsub32.ins")
-		comment "Start uninstall sub section"
-		Sub "%ScriptPath%\delsub32.ins"
-	endif
+	; if FileExists("%ScriptPath%\delsub32.ins")
+	; 	comment "Start uninstall sub section"
+	; 	Sub "%ScriptPath%\delsub32.ins"
+	; endif
 	
 	Message "Installing " + $ProductId$ + " ..."
 	
@@ -82,8 +82,8 @@ endif
 ; You can use $LicenseKey$ var to pass a license key to the installer
 ;
 
-rundll32 advpack.dll,LaunchINFSection %ScriptPath%\X86FILE,Install
-rundll32 advpack.dll,LaunchINFSection %ScriptPath%\AcceptEULA,Install
+rundll32 setupapi,InstallHinfSection DefaultInstall 132 %ScriptPath%\Install_SysinternalsSuite.inf
+rundll32 setupapi,InstallHinfSection DefaultInstall 132 %ScriptPath%\AcceptEULA.inf
 
 
 
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index 7d71433..af5b497 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -32,10 +32,10 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
-if FileExists("%ScriptPath%\delsub32.ins")
-	comment "Start uninstall sub section"
-	Sub "%ScriptPath%\delsub32.ins"
-endif
+; if FileExists("%ScriptPath%\delsub32.ins")
+; 	comment "Start uninstall sub section"
+; 	Sub "%ScriptPath%\delsub32.ins"
+; endif
 
 if $LicenseRequired$ = "true"
 	comment "Licensing required, free license used"
diff --git a/build.sh b/build.sh
index f2fcb61..e926d1f 100644
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 PN="sysinternalsuite"
 VERSION="2011.05.18"
-RELEASE="1"
+RELEASE="2"
 PRIORITY="0"
 ADVICE=""
 TYPE="public"
diff --git a/readme b/readme
new file mode 100644
index 0000000..3aaafde
--- /dev/null
+++ b/readme
@@ -0,0 +1,4 @@
+Creating the Install_SysinternalsSuite.inf:
+
+follow the howto:
+http://blogs.technet.com/b/elevationpowertoys/archive/2010/10/27/powershell-script-to-create-a-sysinternals-suite-inf-file-installer.aspx
\ No newline at end of file
diff --git a/todo b/todo
new file mode 100644
index 0000000..b9f5855
--- /dev/null
+++ b/todo
@@ -0,0 +1,6 @@
+ToDo:
+* reactivate the uninstall
+* extend the acceptEULA.inf to the new tools in the suite
+
+
+Done:
\ No newline at end of file