From c136d1c49164df28fde39e698585d0517b6d944f Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Tue, 30 Apr 2013 19:13:42 +0200
Subject: [PATCH] Bump and set default language

---
 CLIENT_DATA/delsub3264.ins         | 8 ++++----
 CLIENT_DATA/setup3264.ins          | 9 +++++++--
 builder-product.cfg                | 2 +-
 ccsetup-4.00.4064_slim.exe.sha1sum | 1 -
 ccsetup-4.01.4093_slim.exe.sha1sum | 1 +
 5 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 100644 ccsetup-4.00.4064_slim.exe.sha1sum
 create mode 100644 ccsetup-4.01.4093_slim.exe.sha1sum

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 ac87069..73bcead 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
@@ -108,7 +113,7 @@ copy "$IniCfgFile$" "$InstallDir32$"
 copy "%ScriptPath%\ccleaner.ini" "$InstallDir32$"
 
 [Winbatch_install_64]
-"$InstallExe$" /S
+"$InstallExe$" /S /D="$InstallDir64$" /L=$LanguageId$
 
 [Files_install_64]
 ; copy the ini file to the InstallDir
diff --git a/builder-product.cfg b/builder-product.cfg
index e4dc07e..d552838 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,7 @@ VENDOR="piriform.com"
 PN="piriform.ccleaner"
 NAME="CCleaner"
 DESCRIPTION="Die kostenlose Optimierungssoftware CCleaner dient zur Optimierung und zum Aufraeumen von Microsoft Windows."
-VERSION="4.00.4064"
+VERSION="4.01.4093"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
diff --git a/ccsetup-4.00.4064_slim.exe.sha1sum b/ccsetup-4.00.4064_slim.exe.sha1sum
deleted file mode 100644
index 647102a..0000000
--- a/ccsetup-4.00.4064_slim.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-e20058391092beedda758d82ebcc3ff9062eb94c  /home/mario/.opsi-dist-cache/piriform.ccleaner-4.00.4064/X86/ccsetup-4.00.4064_slim.exe
diff --git a/ccsetup-4.01.4093_slim.exe.sha1sum b/ccsetup-4.01.4093_slim.exe.sha1sum
new file mode 100644
index 0000000..88c2b00
--- /dev/null
+++ b/ccsetup-4.01.4093_slim.exe.sha1sum
@@ -0,0 +1 @@
+6862e06e7c6f50a7a391e10477b35abd766e9c42  /home/mario/.opsi-dist-cache/piriform.ccleaner-4.01.4093/X86/ccsetup-4.01.4093_slim.exe