From 94415fa725729d31a6d459fdc734aacff10bb62b Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Wed, 25 Sep 2019 05:11:06 +0200
Subject: [PATCH] Add missing declaration

---
 sample/All/CLIENT_DATA/delsub32.opsiscript      |  6 +++---
 sample/All/CLIENT_DATA/delsub3264.opsiscript    | 12 ++++++------
 sample/All/CLIENT_DATA/delsub64.opsiscript      |  6 +++---
 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 -
 sample/All/builder-product.cfg                  |  8 ++++----
 10 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/sample/All/CLIENT_DATA/delsub32.opsiscript b/sample/All/CLIENT_DATA/delsub32.opsiscript
index cb0409a..93d4819 100644
--- a/sample/All/CLIENT_DATA/delsub32.opsiscript
+++ b/sample/All/CLIENT_DATA/delsub32.opsiscript
@@ -3,7 +3,7 @@
 ; and published under the Terms of the General Public License.
 ; credits: http://www.opsi.org/en/credits/
 
-Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
+Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallExecutable$
 Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
 
 if FileExists($IniFile$)
@@ -16,8 +16,8 @@ else
 endif
 
 if FileExists($IniFile$)
-	Set $UninstallExec$ = GetValueFromInifile($IniFile$,"X86","UninstallExec","XXXXXXXX.exe")
-	Set $UninstallProgramOld$ = $InstallDir$ + $UninstallExec$
+	Set $UninstallExecutable$ = GetValueFromInifile($IniFile$,"X86","UninstallExecutable","XXXXXXXX.exe")
+	Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallExecutable$
 	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 a46f52c..668507f 100644
--- a/sample/All/CLIENT_DATA/delsub3264.opsiscript
+++ b/sample/All/CLIENT_DATA/delsub3264.opsiscript
@@ -4,10 +4,10 @@
 ; credits: http://www.opsi.org/en/credits/
 
 
-Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe"
+Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallExecutable32$
 Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
 
-Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe"
+Set $UninstallProgram64$ = $InstallDir64$ + "\" + $UninstallExecutable64$
 Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
 
 if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
@@ -21,8 +21,8 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
         endif
 
 	if FileExists($IniFile32$)
-		Set $UninstallExec32$ = GetValueFromInifile($IniFile$,"X86","UninstallExec32","XXXXXXXX.exe")
-		Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallExec32$
+		Set $UninstallExecutable32$ = GetValueFromInifile($IniFile$,"X86","UninstallExecutable32","XXXXXXXX.exe")
+		Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallExecutable32$
 		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 $UninstallExec64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallExec64","XXXXXXXX.exe")
-		Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallExec64$
+		Set $UninstallExecutable64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallExecutable64","XXXXXXXX.exe")
+		Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallExecutable64$
 		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 d915188..47abead 100644
--- a/sample/All/CLIENT_DATA/delsub64.opsiscript
+++ b/sample/All/CLIENT_DATA/delsub64.opsiscript
@@ -4,7 +4,7 @@
 ; credits: http://www.opsi.org/en/credits/
 
 
-Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
+Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallExecutable$
 Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
 
 if FileExists($IniFile$)
@@ -17,8 +17,8 @@ else
 endif
 
 if FileExists($IniFile$)
-	Set $UninstallExec$ = GetValueFromInifile($IniFile$,"X86_64","UninstallExec","XXXXXXXX.exe")
-	Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallExec$
+	Set $UninstallExecutable$ = GetValueFromInifile($IniFile$,"X86_64","UninstallExecutable","XXXXXXXX.exe")
+	Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallExecutable$
 	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 bbb6898..2f106c4 100644
--- a/sample/All/CLIENT_DATA/setup32.opsiscript
+++ b/sample/All/CLIENT_DATA/setup32.opsiscript
@@ -9,7 +9,6 @@ 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 6fee349..98948ad 100644
--- a/sample/All/CLIENT_DATA/setup3264.opsiscript
+++ b/sample/All/CLIENT_DATA/setup3264.opsiscript
@@ -9,11 +9,9 @@ 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 fb0b3f2..25de817 100644
--- a/sample/All/CLIENT_DATA/setup64.opsiscript
+++ b/sample/All/CLIENT_DATA/setup64.opsiscript
@@ -9,7 +9,6 @@ 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 0211b6e..60aebbb 100644
--- a/sample/All/CLIENT_DATA/uninstall32.opsiscript
+++ b/sample/All/CLIENT_DATA/uninstall32.opsiscript
@@ -9,7 +9,6 @@ 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 cb4d183..b6871db 100644
--- a/sample/All/CLIENT_DATA/uninstall3264.opsiscript
+++ b/sample/All/CLIENT_DATA/uninstall3264.opsiscript
@@ -9,11 +9,9 @@ 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 dc35649..c140fc2 100644
--- a/sample/All/CLIENT_DATA/uninstall64.opsiscript
+++ b/sample/All/CLIENT_DATA/uninstall64.opsiscript
@@ -9,7 +9,6 @@ ScriptErrorMessages=off
 
 DefVar $MsiIdOld$
 DefVar $UninstallProgramOld$
-DefVar $UninstallExec$
 DefVar $IniFile$
 DefVar $IniCfgFile$
 DefVar $LogDir$
diff --git a/sample/All/builder-product.cfg b/sample/All/builder-product.cfg
index 449ec48..b5191ad 100644
--- a/sample/All/builder-product.cfg
+++ b/sample/All/builder-product.cfg
@@ -161,13 +161,13 @@ OPSI_INI_VALUE[0]="{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}"
 ##### Installer ##############
 
 OPSI_INI_SECTION[0]="X86"
-OPSI_INI_OPTION[0]="UninstallProg"
+OPSI_INI_OPTION[0]="UninstallExecutable"
 OPSI_INI_VALUE[0]="uninstall.exe"
 
 # OR
 
 OPSI_INI_SECTION[1]="X86_64"
-OPSI_INI_OPTION[1]="UninstallProg"
+OPSI_INI_OPTION[1]="UninstallExecutable"
 OPSI_INI_VALUE[1]="uninstall.exe"
 
 
@@ -186,12 +186,12 @@ OPSI_INI_VALUE[1]="{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}"
 
 ##### Installer ##############
 OPSI_INI_SECTION[0]="X86"
-OPSI_INI_OPTION[0]="UninstallProg32"
+OPSI_INI_OPTION[0]="UninstallExecutable32"
 OPSI_INI_VALUE[0]="uninstall.exe"
 
 # AND
 
 OPSI_INI_SECTION[1]="X86_64"
-OPSI_INI_OPTION[1]="UninstallProg64"
+OPSI_INI_OPTION[1]="UninstallExecutable64"
 OPSI_INI_VALUE[1]="uninstall.exe"