Add Reboot for Broken Installers
This commit is contained in:
parent
3e037f3d4b
commit
19f6c88c32
@ -24,12 +24,14 @@ if FileExists($IniFile$)
|
||||
comment "Uninstall program found, starting uninstall"
|
||||
Winbatch_uninstall_old
|
||||
sub_check_exitcode
|
||||
;set $Reboot$="1"
|
||||
endif
|
||||
endif
|
||||
if FileExists($UninstallProgram$)
|
||||
comment "Uninstall program found, starting uninstall"
|
||||
Winbatch_uninstall
|
||||
sub_check_exitcode
|
||||
;set $Reboot$="1"
|
||||
endif
|
||||
|
||||
if FileExists($IniFile$)
|
||||
@ -38,12 +40,14 @@ if FileExists($IniFile$)
|
||||
comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version"
|
||||
Winbatch_uninstall_msi_old
|
||||
sub_check_exitcode
|
||||
;set $Reboot$="1"
|
||||
endif
|
||||
endif
|
||||
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "")
|
||||
comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall"
|
||||
Winbatch_uninstall_msi
|
||||
sub_check_exitcode
|
||||
;set $Reboot$="1"
|
||||
endif
|
||||
|
||||
;comment "Kill Web Browser"
|
||||
@ -58,6 +62,10 @@ Registry_uninstall /32Bit
|
||||
comment "Delete program shortcuts"
|
||||
LinkFolder_uninstall
|
||||
|
||||
if $Reboot$="1"
|
||||
ExitWindows /ImmediateReboot
|
||||
endif
|
||||
|
||||
[Winbatch_uninstall_old]
|
||||
; Choose one of the following examples as basis for program uninstall
|
||||
;
|
||||
|
@ -108,6 +108,10 @@ endif
|
||||
comment "Delete program shortcuts"
|
||||
LinkFolder_uninstall
|
||||
|
||||
if $Reboot$="1"
|
||||
ExitWindows /ImmediateReboot
|
||||
endif
|
||||
|
||||
[Winbatch_uninstall_old_32]
|
||||
; Choose one of the following examples as basis for program uninstall
|
||||
;
|
||||
|
@ -58,6 +58,10 @@ Registry_uninstall /64Bit
|
||||
comment "Delete program shortcuts"
|
||||
LinkFolder_uninstall
|
||||
|
||||
if $Reboot$="1"
|
||||
ExitWindows /ImmediateReboot
|
||||
endif
|
||||
|
||||
[Winbatch_uninstall_old]
|
||||
; Choose one of the following examples as basis for program uninstall
|
||||
;
|
||||
|
@ -26,6 +26,8 @@ DefVar $OLD_VERSION$
|
||||
DefVar $OLD_CREATOR_TAG$
|
||||
DefVar $OLD_RELEASE$
|
||||
|
||||
DefVar $Reboot$
|
||||
|
||||
DefStringList $languageInfo$
|
||||
set $languageInfo$ = getLocaleInfoMap
|
||||
DefVar $LanguageId$
|
||||
|
@ -33,6 +33,8 @@ DefVar $OLD_VERSION$
|
||||
DefVar $OLD_CREATOR_TAG$
|
||||
DefVar $OLD_RELEASE$
|
||||
|
||||
DefVar $Reboot$
|
||||
|
||||
Set $INST_SystemType$ = GetSystemType
|
||||
set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
|
||||
|
||||
|
@ -26,6 +26,8 @@ DefVar $OLD_VERSION$
|
||||
DefVar $OLD_CREATOR_TAG$
|
||||
DefVar $OLD_RELEASE$
|
||||
|
||||
DefVar $Reboot$
|
||||
|
||||
DefStringList $languageInfo$
|
||||
set $languageInfo$ = getLocaleInfoMap
|
||||
DefVar $LanguageId$
|
||||
|
@ -22,6 +22,8 @@ DefVar $OLD_VERSION$
|
||||
DefVar $OLD_CREATOR_TAG$
|
||||
DefVar $OLD_RELEASE$
|
||||
|
||||
DefVar $Reboot$
|
||||
|
||||
Set $LogDir$ = "%opsiLogDir%"
|
||||
|
||||
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
|
||||
|
@ -29,10 +29,11 @@ DefVar $OLD_VERSION$
|
||||
DefVar $OLD_CREATOR_TAG$
|
||||
DefVar $OLD_RELEASE$
|
||||
|
||||
DefVar $Reboot$
|
||||
|
||||
Set $INST_SystemType$ = GetSystemType
|
||||
set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
|
||||
|
||||
|
||||
Set $LogDir$ = "%opsiLogDir%"
|
||||
|
||||
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
|
||||
|
@ -22,6 +22,8 @@ DefVar $OLD_VERSION$
|
||||
DefVar $OLD_CREATOR_TAG$
|
||||
DefVar $OLD_RELEASE$
|
||||
|
||||
DefVar $Reboot$
|
||||
|
||||
Set $LogDir$ = "%opsiLogDir%"
|
||||
|
||||
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
|
||||
|
Loading…
Reference in New Issue
Block a user