From e5fedd10b0d1182226f2f7555e2d9322cd9b9592 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Tue, 30 Apr 2013 19:34:28 +0200
Subject: [PATCH] Use correct language on install

---
 CLIENT_DATA/delsub3264.ins |  8 ++++----
 CLIENT_DATA/setup3264.ins  | 11 +++++++++--
 builder-product.cfg        |  6 +++++-
 builder-targets-cb.sh      |  6 ++++++
 4 files changed, 24 insertions(+), 7 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 69a7e3b..d68e55e 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,22 +105,24 @@ else
 endif
 
 [Winbatch_install_32]
-"$InstallExe$" /S
+"$InstallExe$" /S /D="$InstallDir32$" /L=$LanguageId$
 
 [Files_install_32]
 ; copy the ini file to the InstallDir
 copy "$IniCfgFile$" "$InstallDir32$"
+copy "%ScriptPath%\defraggler.ini" "$InstallDir32$"
 
 ; Example of recursively copying some files into the installation directory:
 ;
 ; 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
 copy "$IniCfgFile$" "$InstallDir64$"
+copy "%ScriptPath%\defraggler.ini" "$InstallDir64$"
 
 ; Example of recursively copying some files into the installation directory:
 ;
diff --git a/builder-product.cfg b/builder-product.cfg
index fd87a84..e02d775 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,7 @@ VENDOR="piriform.com"
 PN="piriform.defraggler"
 NAME="Defraggler"
 DESCRIPTION="Use Defraggler to defrag your entire hard drive, or individual files - unique in the industry."
-VERSION="2.13.670"
+VERSION="2.14.706"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
@@ -34,3 +34,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..520076a 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -23,3 +23,9 @@ function cleanup() {
     echo "Cleanup"
     builder_cleanup
 }
+
+function create() {
+    echo "Create"
+    builder_create
+    cp $INST_DIR/CLIENT_DATA/opsi-${PN}.ini $INST_DIR/CLIENT_DATA/defraggler.ini
+}
\ No newline at end of file