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

correct uninstall

Browse Source
This commit is contained in:
Mario Fetka 2012-02-08 11:35:30 +01:00
parent cecda3abc2
commit 9057785105
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CLIENT_DATA/delsub32.ins
View File

@ -4,7 +4,7 @@
; credits: http://www.opsi.org/credits/ ; credits: http://www.opsi.org/credits/
Set $MsiIdConv$ = '{90120000-0020-0409-0000-0000000FF1CE}' Set $MsiIdConv$ = '{90120000-0020-0407-0000-0000000FF1CE}'
Set $MsiId$ = '{90850407-6000-11D3-8CFE-0150048383C9}' Set $MsiId$ = '{90850407-6000-11D3-8CFE-0150048383C9}'
Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
@ -15,6 +15,11 @@ if FileExists($UninstallProgram$)
Winbatch_uninstall Winbatch_uninstall
sub_check_exitcode sub_check_exitcode
endif endif
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdConv$ + "] DisplayName") = "")
comment "MSI id " + $MsiIdConv$ + " found in registry, starting msiexec to uninstall"
Winbatch_uninstall_msi_conv
sub_check_exitcode
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
@ -40,8 +45,10 @@ LinkFolder_uninstall
; "$UninstallProgram$" /silent /norestart ; "$UninstallProgram$" /silent /norestart
[Winbatch_uninstall_msi] [Winbatch_uninstall_msi_conv]
msiexec /x $MsiIdConv$ /qb! REBOOT=ReallySuppress msiexec /x $MsiIdConv$ /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi]
msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
[Files_uninstall] [Files_uninstall]

1
CLIENT_DATA/setup32.ins
View File

@ -7,6 +7,7 @@
requiredWinstVersion >= "4.10.8.6" requiredWinstVersion >= "4.10.8.6"
DefVar $MsiId$ DefVar $MsiId$
DefVar $MsiIdConv$
DefVar $UninstallProgram$ DefVar $UninstallProgram$
DefVar $LogDir$ DefVar $LogDir$
DefVar $ProductId$ DefVar $ProductId$

1
CLIENT_DATA/uninstall32.ins
View File

@ -7,6 +7,7 @@
requiredWinstVersion >= "4.10.8.6" requiredWinstVersion >= "4.10.8.6"
DefVar $MsiId$ DefVar $MsiId$
DefVar $MsiIdConv$
DefVar $UninstallProgram$ DefVar $UninstallProgram$
DefVar $LogDir$ DefVar $LogDir$
DefVar $ExitCode$ DefVar $ExitCode$