Bump and set default language

This commit is contained in:
Mario Fetka
2013-04-30 19:13:42 +02:00
parent 68a8cc37dc
commit c136d1c491
5 changed files with 13 additions and 8 deletions

View File

@@ -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

View File

@@ -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