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

Add Reboot for Broken Installers

This commit is contained in:
Mario Fetka 2019-10-16 20:33:39 +02:00
parent 3e037f3d4b
commit 19f6c88c32
9 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,12 +24,14 @@ if FileExists($IniFile$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_old Winbatch_uninstall_old
sub_check_exitcode sub_check_exitcode
;set $Reboot$="1"
endif endif
endif endif
if FileExists($UninstallProgram$) if FileExists($UninstallProgram$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall Winbatch_uninstall
sub_check_exitcode sub_check_exitcode
;set $Reboot$="1"
endif endif
if FileExists($IniFile$) if FileExists($IniFile$)
@ -38,12 +40,14 @@ if FileExists($IniFile$)
comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version" comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version"
Winbatch_uninstall_msi_old Winbatch_uninstall_msi_old
sub_check_exitcode sub_check_exitcode
;set $Reboot$="1"
endif endif
endif endif
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "") if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "")
comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall" comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall"
Winbatch_uninstall_msi Winbatch_uninstall_msi
sub_check_exitcode sub_check_exitcode
;set $Reboot$="1"
endif endif
;comment "Kill Web Browser" ;comment "Kill Web Browser"
@ -58,6 +62,10 @@ Registry_uninstall /32Bit
comment "Delete program shortcuts" comment "Delete program shortcuts"
LinkFolder_uninstall LinkFolder_uninstall
if $Reboot$="1"
ExitWindows /ImmediateReboot
endif
[Winbatch_uninstall_old] [Winbatch_uninstall_old]
; Choose one of the following examples as basis for program uninstall ; Choose one of the following examples as basis for program uninstall
; ;

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

@ -108,6 +108,10 @@ endif
comment "Delete program shortcuts" comment "Delete program shortcuts"
LinkFolder_uninstall LinkFolder_uninstall
if $Reboot$="1"
ExitWindows /ImmediateReboot
endif
[Winbatch_uninstall_old_32] [Winbatch_uninstall_old_32]
; Choose one of the following examples as basis for program uninstall ; Choose one of the following examples as basis for program uninstall
; ;

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

@ -58,6 +58,10 @@ Registry_uninstall /64Bit
comment "Delete program shortcuts" comment "Delete program shortcuts"
LinkFolder_uninstall LinkFolder_uninstall
if $Reboot$="1"
ExitWindows /ImmediateReboot
endif
[Winbatch_uninstall_old] [Winbatch_uninstall_old]
; Choose one of the following examples as basis for program uninstall ; Choose one of the following examples as basis for program uninstall
; ;

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

@ -26,6 +26,8 @@ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$ DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$ DefVar $OLD_RELEASE$
DefVar $Reboot$
DefStringList $languageInfo$ DefStringList $languageInfo$
set $languageInfo$ = getLocaleInfoMap set $languageInfo$ = getLocaleInfoMap
DefVar $LanguageId$ DefVar $LanguageId$

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

@ -33,6 +33,8 @@ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$ DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$ DefVar $OLD_RELEASE$
DefVar $Reboot$
Set $INST_SystemType$ = GetSystemType Set $INST_SystemType$ = GetSystemType
set $INST_architecture$ = GetProductProperty("install_architecture","system specific") set $INST_architecture$ = GetProductProperty("install_architecture","system specific")

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

@ -26,6 +26,8 @@ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$ DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$ DefVar $OLD_RELEASE$
DefVar $Reboot$
DefStringList $languageInfo$ DefStringList $languageInfo$
set $languageInfo$ = getLocaleInfoMap set $languageInfo$ = getLocaleInfoMap
DefVar $LanguageId$ DefVar $LanguageId$

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

@ -22,6 +22,8 @@ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$ DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$ DefVar $OLD_RELEASE$
DefVar $Reboot$
Set $LogDir$ = "%opsiLogDir%" Set $LogDir$ = "%opsiLogDir%"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh

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

@ -29,10 +29,11 @@ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$ DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$ DefVar $OLD_RELEASE$
DefVar $Reboot$
Set $INST_SystemType$ = GetSystemType Set $INST_SystemType$ = GetSystemType
set $INST_architecture$ = GetProductProperty("install_architecture","system specific") set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
Set $LogDir$ = "%opsiLogDir%" Set $LogDir$ = "%opsiLogDir%"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh

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

@ -22,6 +22,8 @@ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$ DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$ DefVar $OLD_RELEASE$
DefVar $Reboot$
Set $LogDir$ = "%opsiLogDir%" Set $LogDir$ = "%opsiLogDir%"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh