setup progrann and config.ini are conflicting so just use the setup and the registry

This commit is contained in:
Mario Fetka 2013-04-30 19:38:17 +02:00
parent 3cdd6e8ff3
commit 8127944768
4 changed files with 18 additions and 6 deletions

View File

@ -23,13 +23,13 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
if FileExists($UninstallProgramOld32$) if FileExists($UninstallProgramOld32$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_old_32 Winbatch_uninstall_old_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
sub_check_exitcode sub_check_exitcode
endif endif
endif endif
if FileExists($UninstallProgram32$) if FileExists($UninstallProgram32$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_32 Winbatch_uninstall_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
sub_check_exitcode sub_check_exitcode
endif endif
@ -52,13 +52,13 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$ Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
if FileExists($UninstallProgramOld64$) if FileExists($UninstallProgramOld64$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_old_64 Winbatch_uninstall_old_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
sub_check_exitcode sub_check_exitcode
endif endif
endif endif
if FileExists($UninstallProgram64$) if FileExists($UninstallProgram64$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_64 Winbatch_uninstall_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
sub_check_exitcode sub_check_exitcode
endif endif

View File

@ -25,6 +25,11 @@ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$ DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$ DefVar $OLD_RELEASE$
DefStringList $languageInfo$
set $languageInfo$ = getLocaleInfoMap
DefVar $LanguageId$
set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
Set $INST_SystemType$ = GetSystemType Set $INST_SystemType$ = GetSystemType
set $INST_architecture$ = GetProductProperty("install_architecture","system specific") set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
@ -100,7 +105,7 @@ else
endif endif
[Winbatch_install_32] [Winbatch_install_32]
"$InstallExe$" /S "$InstallExe$" /S /D="$InstallDir32$" /L=$LanguageId$
[Files_install_32] [Files_install_32]
; copy the ini file to the InstallDir ; copy the ini file to the InstallDir
@ -111,7 +116,7 @@ copy "$IniCfgFile$" "$InstallDir32$"
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$" ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
[Winbatch_install_64] [Winbatch_install_64]
"$InstallExe$" /S "$InstallExe$" /S /D="$InstallDir64$" /L=$LanguageId$
[Files_install_64] [Files_install_64]
; copy the ini file to the InstallDir ; copy the ini file to the InstallDir
@ -128,6 +133,8 @@ copy "$IniCfgFile$" "$InstallDir64$"
; set "name1" = "some string value" ; set "name1" = "some string value"
; set "name2" = REG_DWORD:0001 ; set "name2" = REG_DWORD:0001
; set "name3" = REG_BINARY:00 af 99 cd ; set "name3" = REG_BINARY:00 af 99 cd
openkey [HKEY_LOCAL_MACHINE\SOFTWARE\Piriform\Recuva]
set "UpdateCheck" = "0"
[LinkFolder_install] [LinkFolder_install]
; Example of deleting a folder from AllUsers startmenu: ; Example of deleting a folder from AllUsers startmenu:

View File

@ -33,3 +33,7 @@ OPSI_INI_VALUE[0]="uninst.exe"
OPSI_INI_SECTION[1]="X86_64" OPSI_INI_SECTION[1]="X86_64"
OPSI_INI_OPTION[1]="UninstallProg64" OPSI_INI_OPTION[1]="UninstallProg64"
OPSI_INI_VALUE[1]="uninst.exe" OPSI_INI_VALUE[1]="uninst.exe"
OPSI_INI_SECTION[2]="Options"
OPSI_INI_OPTION[2]="UpdateCheck"
OPSI_INI_VALUE[2]="0"

View File

@ -23,3 +23,4 @@ function cleanup() {
echo "Cleanup" echo "Cleanup"
builder_cleanup builder_cleanup
} }