change 34 to Old ist more general for the next major release
This commit is contained in:
parent
db3a9721a3
commit
60302e443d
@ -4,21 +4,21 @@
|
|||||||
; credits: http://www.opsi.org/credits/
|
; credits: http://www.opsi.org/credits/
|
||||||
|
|
||||||
|
|
||||||
Set $MsiId34$ = '{03CEFC42-378E-4467-9909-DCBAFD38CA9F}'
|
Set $MsiIdOld$ = '{03CEFC42-378E-4467-9909-DCBAFD38CA9F}'
|
||||||
Set $MsiIdHelp34$ = '{F8DF795C-5865-43BB-A547-7FFD0EA753F9}'
|
Set $MsiIdHelpOld$ = '{F8DF795C-5865-43BB-A547-7FFD0EA753F9}'
|
||||||
Set $MsiId$ = '{BB21B808-F784-4883-A4D4-B1473384C1C6}'
|
Set $MsiId$ = '{BB21B808-F784-4883-A4D4-B1473384C1C6}'
|
||||||
Set $MsiIdHelp$ = '{3641CF63-7FB5-45CA-98D3-FB7D08F63056}'
|
Set $MsiIdHelp$ = '{3641CF63-7FB5-45CA-98D3-FB7D08F63056}'
|
||||||
|
|
||||||
Message "Uninstalling " + $ProductId$ + " ..."
|
Message "Uninstalling " + $ProductId$ + " ..."
|
||||||
|
|
||||||
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId34$ + "] DisplayName") = "")
|
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "")
|
||||||
comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall"
|
comment "MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall"
|
||||||
Winbatch_uninstall_msi_34
|
Winbatch_uninstall_msi_old
|
||||||
sub_check_exitcode
|
sub_check_exitcode
|
||||||
endif
|
endif
|
||||||
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdHelp34$ + "] DisplayName") = "")
|
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdHelpOld$ + "] DisplayName") = "")
|
||||||
comment "MSI id " + $MsiIdHelp$ + " found in registry, starting msiexec to uninstall"
|
comment "MSI id " + $MsiIdHelpOld$ + " found in registry, starting msiexec to uninstall"
|
||||||
Winbatch_uninstall_msi_help_34
|
Winbatch_uninstall_msi_help_old
|
||||||
sub_check_exitcode
|
sub_check_exitcode
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -42,11 +42,11 @@ Registry_uninstall /32Bit
|
|||||||
comment "Delete program shortcuts"
|
comment "Delete program shortcuts"
|
||||||
LinkFolder_uninstall
|
LinkFolder_uninstall
|
||||||
|
|
||||||
[Winbatch_uninstall_msi_34]
|
[Winbatch_uninstall_msi_old]
|
||||||
msiexec /x $MsiId34$ /qb! REBOOT=ReallySuppress
|
msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress
|
||||||
|
|
||||||
[Winbatch_uninstall_msi_help_34]
|
[Winbatch_uninstall_msi_help_old]
|
||||||
msiexec /x $MsiIdHelp34$ /qb! REBOOT=ReallySuppress
|
msiexec /x $MsiIdHelpOld$ /qb! REBOOT=ReallySuppress
|
||||||
|
|
||||||
[Winbatch_uninstall_msi]
|
[Winbatch_uninstall_msi]
|
||||||
msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
|
msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
|
||||||
@ -58,7 +58,7 @@ msiexec /x $MsiIdHelp$ /qb! REBOOT=ReallySuppress
|
|||||||
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
|
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
|
||||||
;
|
;
|
||||||
delete -sf "$InstallDir$\"
|
delete -sf "$InstallDir$\"
|
||||||
delete -sf "$InstallDir34$\"
|
delete -sf "$InstallDirOld$\"
|
||||||
|
|
||||||
[Registry_uninstall]
|
[Registry_uninstall]
|
||||||
; Example of deleting a registry key:
|
; Example of deleting a registry key:
|
||||||
|
@ -6,15 +6,15 @@
|
|||||||
[Actions]
|
[Actions]
|
||||||
requiredWinstVersion >= "4.10.8.6"
|
requiredWinstVersion >= "4.10.8.6"
|
||||||
|
|
||||||
DefVar $MsiId34$
|
DefVar $MsiIdOld$
|
||||||
DefVar $MsiIdHelp34$
|
DefVar $MsiIdHelpOld$
|
||||||
DefVar $MsiId$
|
DefVar $MsiId$
|
||||||
DefVar $MsiIdHelp$
|
DefVar $MsiIdHelp$
|
||||||
DefVar $LogDir$
|
DefVar $LogDir$
|
||||||
DefVar $ProductId$
|
DefVar $ProductId$
|
||||||
DefVar $MinimumSpace$
|
DefVar $MinimumSpace$
|
||||||
DefVar $InstallDir$
|
DefVar $InstallDir$
|
||||||
DefVar $InstallDir34$
|
DefVar $InstallDirOld$
|
||||||
DefVar $ExitCode$
|
DefVar $ExitCode$
|
||||||
|
|
||||||
Set $LogDir$ = "%SystemDrive%\tmp"
|
Set $LogDir$ = "%SystemDrive%\tmp"
|
||||||
@ -39,7 +39,7 @@ Set $ProductId$ = "libreoffice"
|
|||||||
Set $MinimumSpace$ = "1500 MB"
|
Set $MinimumSpace$ = "1500 MB"
|
||||||
; the path were we find the product after the installation
|
; the path were we find the product after the installation
|
||||||
Set $InstallDir$ = "%ProgramFiles32Dir%\LibreOffice 3.5"
|
Set $InstallDir$ = "%ProgramFiles32Dir%\LibreOffice 3.5"
|
||||||
Set $InstallDir34$ = "%ProgramFiles32Dir%\LibreOffice 3.4"
|
Set $InstallDirOld$ = "%ProgramFiles32Dir%\LibreOffice 3.4"
|
||||||
; ----------------------------------------------------------------
|
; ----------------------------------------------------------------
|
||||||
|
|
||||||
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
|
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
|
||||||
|
@ -8,11 +8,13 @@ requiredWinstVersion >= "4.10.8.6"
|
|||||||
|
|
||||||
DefVar $MsiId$
|
DefVar $MsiId$
|
||||||
DefVar $MsiIdHelp$
|
DefVar $MsiIdHelp$
|
||||||
|
DefVar $MsiIdOld$
|
||||||
|
DefVar $MsiIdHelpOld$
|
||||||
DefVar $LogDir$
|
DefVar $LogDir$
|
||||||
DefVar $ExitCode$
|
DefVar $ExitCode$
|
||||||
DefVar $ProductId$
|
DefVar $ProductId$
|
||||||
DefVar $InstallDir$
|
DefVar $InstallDir$
|
||||||
DefVar $InstallDir34$
|
DefVar $InstallDirOld$
|
||||||
|
|
||||||
Set $LogDir$ = "%SystemDrive%\tmp"
|
Set $LogDir$ = "%SystemDrive%\tmp"
|
||||||
|
|
||||||
@ -31,7 +33,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
|
|||||||
; ----------------------------------------------------------------
|
; ----------------------------------------------------------------
|
||||||
Set $ProductId$ = "libreoffice"
|
Set $ProductId$ = "libreoffice"
|
||||||
Set $InstallDir$ = "%ProgramFiles32Dir%\LibreOffice 3.5"
|
Set $InstallDir$ = "%ProgramFiles32Dir%\LibreOffice 3.5"
|
||||||
Set $InstallDir34$ = "%ProgramFiles32Dir%\LibreOffice 3.4"
|
Set $InstallDirOld$ = "%ProgramFiles32Dir%\LibreOffice 3.4"
|
||||||
; ----------------------------------------------------------------
|
; ----------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user