From 5f33f480f1debf195bde5b234d79cb8b9a67c4d6 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 24 Sep 2019 23:47:06 +0200 Subject: [PATCH] Add missing declaration --- sample/All/CLIENT_DATA/delsub32.opsiscript | 4 ++-- sample/All/CLIENT_DATA/delsub3264.opsiscript | 8 ++++---- sample/All/CLIENT_DATA/delsub64.opsiscript | 4 ++-- sample/All/CLIENT_DATA/setup32.opsiscript | 1 + sample/All/CLIENT_DATA/setup3264.opsiscript | 2 ++ sample/All/CLIENT_DATA/setup64.opsiscript | 1 + sample/All/CLIENT_DATA/uninstall32.opsiscript | 1 + sample/All/CLIENT_DATA/uninstall3264.opsiscript | 2 ++ sample/All/CLIENT_DATA/uninstall64.opsiscript | 1 + 9 files changed, 16 insertions(+), 8 deletions(-) diff --git a/sample/All/CLIENT_DATA/delsub32.opsiscript b/sample/All/CLIENT_DATA/delsub32.opsiscript index a6778f6..cb0409a 100644 --- a/sample/All/CLIENT_DATA/delsub32.opsiscript +++ b/sample/All/CLIENT_DATA/delsub32.opsiscript @@ -16,8 +16,8 @@ else endif if FileExists($IniFile$) - Set $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe") - Set $UninstallProgramOld$ = $InstallDir$ + $UninstallProg$ + Set $UninstallExec$ = GetValueFromInifile($IniFile$,"X86","UninstallExec","XXXXXXXX.exe") + Set $UninstallProgramOld$ = $InstallDir$ + $UninstallExec$ if FileExists($UninstallProgramOld$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall_old diff --git a/sample/All/CLIENT_DATA/delsub3264.opsiscript b/sample/All/CLIENT_DATA/delsub3264.opsiscript index 7c16d3b..a46f52c 100644 --- a/sample/All/CLIENT_DATA/delsub3264.opsiscript +++ b/sample/All/CLIENT_DATA/delsub3264.opsiscript @@ -21,8 +21,8 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif endif if FileExists($IniFile32$) - Set $UninstallProg32$ = GetValueFromInifile($IniFile$,"X86","UninstallProg32","XXXXXXXX.exe") - Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ + Set $UninstallExec32$ = GetValueFromInifile($IniFile$,"X86","UninstallExec32","XXXXXXXX.exe") + Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallExec32$ if FileExists($UninstallProgramOld32$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall_old_32 @@ -66,8 +66,8 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe endif if FileExists($IniFile64$) - Set $UninstallProg64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallProg64","XXXXXXXX.exe") - Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$ + Set $UninstallExec64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallExec64","XXXXXXXX.exe") + Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallExec64$ if FileExists($UninstallProgramOld64$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall_old_64 diff --git a/sample/All/CLIENT_DATA/delsub64.opsiscript b/sample/All/CLIENT_DATA/delsub64.opsiscript index fae9290..d915188 100644 --- a/sample/All/CLIENT_DATA/delsub64.opsiscript +++ b/sample/All/CLIENT_DATA/delsub64.opsiscript @@ -17,8 +17,8 @@ else endif if FileExists($IniFile$) - Set $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe") - Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ + Set $UninstallExec$ = GetValueFromInifile($IniFile$,"X86_64","UninstallExec","XXXXXXXX.exe") + Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallExec$ if FileExists($UninstallProgramOld$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall_old diff --git a/sample/All/CLIENT_DATA/setup32.opsiscript b/sample/All/CLIENT_DATA/setup32.opsiscript index 2f106c4..bbb6898 100644 --- a/sample/All/CLIENT_DATA/setup32.opsiscript +++ b/sample/All/CLIENT_DATA/setup32.opsiscript @@ -9,6 +9,7 @@ ScriptErrorMessages=off DefVar $MsiIdOld$ DefVar $UninstallProgramOld$ +DefVar $UninstallExec$ DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$ diff --git a/sample/All/CLIENT_DATA/setup3264.opsiscript b/sample/All/CLIENT_DATA/setup3264.opsiscript index 98948ad..6fee349 100644 --- a/sample/All/CLIENT_DATA/setup3264.opsiscript +++ b/sample/All/CLIENT_DATA/setup3264.opsiscript @@ -9,9 +9,11 @@ ScriptErrorMessages=off DefVar $MsiIdOld32$ DefVar $UninstallProgramOld32$ +DefVar $UninstallExec32$ DefVar $IniFile32$ DefVar $MsiIdOld64$ DefVar $UninstallProgramOld64$ +DefVar $UninstallExec64$ DefVar $IniFile64$ DefVar $IniCfgFile$ DefVar $LogDir$ diff --git a/sample/All/CLIENT_DATA/setup64.opsiscript b/sample/All/CLIENT_DATA/setup64.opsiscript index 25de817..fb0b3f2 100644 --- a/sample/All/CLIENT_DATA/setup64.opsiscript +++ b/sample/All/CLIENT_DATA/setup64.opsiscript @@ -9,6 +9,7 @@ ScriptErrorMessages=off DefVar $MsiIdOld$ DefVar $UninstallProgramOld$ +DefVar $UninstallExec$ DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$ diff --git a/sample/All/CLIENT_DATA/uninstall32.opsiscript b/sample/All/CLIENT_DATA/uninstall32.opsiscript index 60aebbb..0211b6e 100644 --- a/sample/All/CLIENT_DATA/uninstall32.opsiscript +++ b/sample/All/CLIENT_DATA/uninstall32.opsiscript @@ -9,6 +9,7 @@ ScriptErrorMessages=off DefVar $MsiIdOld$ DefVar $UninstallProgramOld$ +DefVar $UninstallExec$ DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$ diff --git a/sample/All/CLIENT_DATA/uninstall3264.opsiscript b/sample/All/CLIENT_DATA/uninstall3264.opsiscript index b6871db..cb4d183 100644 --- a/sample/All/CLIENT_DATA/uninstall3264.opsiscript +++ b/sample/All/CLIENT_DATA/uninstall3264.opsiscript @@ -9,9 +9,11 @@ ScriptErrorMessages=off DefVar $MsiIdOld32$ DefVar $UninstallProgramOld32$ +DefVar $UninstallExec32$ DefVar $IniFile32$ DefVar $MsiIdOld64$ DefVar $UninstallProgramOld64$ +DefVar $UninstallExec64$ DefVar $IniFile64$ DefVar $IniCfgFile$ DefVar $LogDir$ diff --git a/sample/All/CLIENT_DATA/uninstall64.opsiscript b/sample/All/CLIENT_DATA/uninstall64.opsiscript index c140fc2..dc35649 100644 --- a/sample/All/CLIENT_DATA/uninstall64.opsiscript +++ b/sample/All/CLIENT_DATA/uninstall64.opsiscript @@ -9,6 +9,7 @@ ScriptErrorMessages=off DefVar $MsiIdOld$ DefVar $UninstallProgramOld$ +DefVar $UninstallExec$ DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$