From 812794476851c3523d7f2419447ddfac3e397763 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Tue, 30 Apr 2013 19:38:17 +0200
Subject: [PATCH] setup progrann and config.ini are conflicting so just use the
 setup and the registry

---
 CLIENT_DATA/delsub3264.ins |  8 ++++----
 CLIENT_DATA/setup3264.ins  | 11 +++++++++--
 builder-product.cfg        |  4 ++++
 builder-targets-cb.sh      |  1 +
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index dc2993c..da4c4ae 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -23,13 +23,13 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 		Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
 		if FileExists($UninstallProgramOld32$)
 			comment "Uninstall program found, starting uninstall"
-			Winbatch_uninstall_old_32
+			Winbatch_uninstall_old_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
 			sub_check_exitcode
 		endif
         endif
 	if FileExists($UninstallProgram32$)
 		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_32
+		Winbatch_uninstall_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
 		sub_check_exitcode
 	endif
 
@@ -52,13 +52,13 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
 		Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
 		if FileExists($UninstallProgramOld64$)
 			comment "Uninstall program found, starting uninstall"
-			Winbatch_uninstall_old_64
+			Winbatch_uninstall_old_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
 			sub_check_exitcode
 		endif
         endif
 	if FileExists($UninstallProgram64$)
 		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_64
+		Winbatch_uninstall_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
 		sub_check_exitcode
 	endif
 
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 33a93d0..9f58eee 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -25,6 +25,11 @@ DefVar $OLD_VERSION$
 DefVar $OLD_CREATOR_TAG$
 DefVar $OLD_RELEASE$
 
+DefStringList $languageInfo$
+set  $languageInfo$ = getLocaleInfoMap
+DefVar $LanguageId$
+set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
+
 Set $INST_SystemType$ = GetSystemType
 set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
 
@@ -100,7 +105,7 @@ else
 endif
 
 [Winbatch_install_32]
-"$InstallExe$" /S
+"$InstallExe$" /S /D="$InstallDir32$" /L=$LanguageId$
 
 [Files_install_32]
 ; copy the ini file to the InstallDir
@@ -111,7 +116,7 @@ copy "$IniCfgFile$" "$InstallDir32$"
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
 
 [Winbatch_install_64]
-"$InstallExe$" /S
+"$InstallExe$" /S /D="$InstallDir64$" /L=$LanguageId$
 
 [Files_install_64]
 ; copy the ini file to the InstallDir
@@ -128,6 +133,8 @@ copy "$IniCfgFile$" "$InstallDir64$"
 ; set "name1" = "some string value"
 ; set "name2" = REG_DWORD:0001
 ; set "name3" = REG_BINARY:00 af 99 cd
+openkey [HKEY_LOCAL_MACHINE\SOFTWARE\Piriform\Recuva]
+set "UpdateCheck" = "0"
 
 [LinkFolder_install]
 ; Example of deleting a folder from AllUsers startmenu:
diff --git a/builder-product.cfg b/builder-product.cfg
index c2c258a..6632f07 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -33,3 +33,7 @@ OPSI_INI_VALUE[0]="uninst.exe"
 OPSI_INI_SECTION[1]="X86_64"
 OPSI_INI_OPTION[1]="UninstallProg64"
 OPSI_INI_VALUE[1]="uninst.exe"
+
+OPSI_INI_SECTION[2]="Options"
+OPSI_INI_OPTION[2]="UpdateCheck"
+OPSI_INI_VALUE[2]="0"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 9a3d4a8..1deae7a 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -23,3 +23,4 @@ function cleanup() {
     echo "Cleanup"
     builder_cleanup
 }
+