From 83b4e5a42ace57ac19c17028cd2409b35a2e746f Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 23 Jan 2012 21:37:25 +0100
Subject: [PATCH] finally solved uninstall

---
 CLIENT_DATA/custom/{CustomConfig.txt => Config.txt} |  0
 CLIENT_DATA/delsub.ins                              | 12 ++++++------
 CLIENT_DATA/setup.ins                               |  4 ++--
 build.sh                                            |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename CLIENT_DATA/custom/{CustomConfig.txt => Config.txt} (100%)

diff --git a/CLIENT_DATA/custom/CustomConfig.txt b/CLIENT_DATA/custom/Config.txt
similarity index 100%
rename from CLIENT_DATA/custom/CustomConfig.txt
rename to CLIENT_DATA/custom/Config.txt
diff --git a/CLIENT_DATA/delsub.ins b/CLIENT_DATA/delsub.ins
index ac291cf..f00a52b 100644
--- a/CLIENT_DATA/delsub.ins
+++ b/CLIENT_DATA/delsub.ins
@@ -4,11 +4,11 @@
 ; credits: http://www.opsi.org/credits/
 
 
-Set $MsiId32$ = '{A6EE99EA-420C-4FA6-8A7C-FDB60D278855}'
-Set $UninstallProgram32$ = $InstallDir32$ + "UVERSION\uninstall.exe"
+Set $MsiId32$ = '{XXXXXXXX-XXXX-XXXX-XXXXXXXXXXXXXXXXX}'
+Set $UninstallProgram32$ = $InstallDir32$ + "\UVERSION\uninstall.exe"
 
-Set $MsiId64$ = '{A6EE99EA-420C-4FA6-8A7C-FDB60D278855}'
-Set $UninstallProgram32$ = $InstallDir64$ + "UVERSION\uninstall.exe"
+Set $MsiId64$ = '{XXXXXXXX-XXXX-XXXX-XXXXXXXXXXXXXXXXX}'
+Set $UninstallProgram32$ = $InstallDir64$ + "\UVERSION\uninstall.exe"
 
 if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
 	Message "Uninstalling " + $ProductId$ + " 32 Bit..."
@@ -68,7 +68,7 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 [Files_uninstall_32]
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
 ;
-; delete -sf "$InstallDir32$\"
+delete -sf "$InstallDir32$\"
 
 [Winbatch_uninstall_64]
 ; Choose one of the following examples as basis for program uninstall
@@ -83,7 +83,7 @@ msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
 [Files_uninstall_64]
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
 ;
-; delete -sf "$InstallDir64$\"
+delete -sf "$InstallDir64$\"
 
 [Registry_uninstall]
 ; Example of deleting a registry key:
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index 2374900..23b5ada 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -101,7 +101,7 @@ endif
 [Files_install_32]
 ; Example of recursively copying some files into the installation directory:
 ;
-copy -s "%ScriptPath%\custom\*.xml" "$InstallDir32$"
+copy -s "%ScriptPath%\custom\*.*" "$InstallDir32$"
 
 [Winbatch_install_64]
 ; Choose one of the following examples as basis for your installation
@@ -114,7 +114,7 @@ copy -s "%ScriptPath%\custom\*.xml" "$InstallDir32$"
 [Files_install_64]
 ; Example of recursively copying some files into the installation directory:
 ;
-copy -s "%ScriptPath%\custom\*.xml" "$InstallDir64$"
+copy -s "%ScriptPath%\custom\*.*" "$InstallDir64$"
 
 [Registry_install]
 ; Example of setting some values of an registry key:
diff --git a/build.sh b/build.sh
index 0882f55..67452ae 100644
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 PN="immunet"
 VERSION="3.0.5.7688"
 UVERSION="3.0.5"
-RELEASE="3"
+RELEASE="4"
 PRIORITY="0"
 ADVICE=""
 TYPE="testing"