go-opsi/opsi.opsi-builder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add missing declaration

Browse Source
This commit is contained in:
Mario Fetka 2019-09-25 05:11:06 +02:00
parent 5f33f480f1
commit 94415fa725
10 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sample/All/CLIENT_DATA/delsub32.opsiscript
View File

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

12
sample/All/CLIENT_DATA/delsub3264.opsiscript
View File

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

6
sample/All/CLIENT_DATA/delsub64.opsiscript
View File

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

1
sample/All/CLIENT_DATA/setup32.opsiscript
View File

@ -9,7 +9,6 @@ ScriptErrorMessages=off
DefVar $MsiIdOld$
DefVar $UninstallProgramOld$
DefVar $UninstallExec$
DefVar $IniFile$
DefVar $IniCfgFile$
DefVar $LogDir$

2
sample/All/CLIENT_DATA/setup3264.opsiscript
View File

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

1
sample/All/CLIENT_DATA/setup64.opsiscript
View File

@ -9,7 +9,6 @@ ScriptErrorMessages=off
DefVar $MsiIdOld$
DefVar $UninstallProgramOld$
DefVar $UninstallExec$
DefVar $IniFile$
DefVar $IniCfgFile$
DefVar $LogDir$

1
sample/All/CLIENT_DATA/uninstall32.opsiscript
View File

@ -9,7 +9,6 @@ ScriptErrorMessages=off
DefVar $MsiIdOld$
DefVar $UninstallProgramOld$
DefVar $UninstallExec$
DefVar $IniFile$
DefVar $IniCfgFile$
DefVar $LogDir$

2
sample/All/CLIENT_DATA/uninstall3264.opsiscript
View File

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

1
sample/All/CLIENT_DATA/uninstall64.opsiscript
View File

@ -9,7 +9,6 @@ ScriptErrorMessages=off
DefVar $MsiIdOld$
DefVar $UninstallProgramOld$
DefVar $UninstallExec$
DefVar $IniFile$
DefVar $IniCfgFile$
DefVar $LogDir$

8
sample/All/builder-product.cfg
View File

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