From 16177f8e9ce00a21808298670612ab555a1dc971 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Wed, 7 Sep 2016 09:46:36 +0200
Subject: [PATCH] Remove legacy unistall vom 64bit and update ini file

---
 CLIENT_DATA/delsub3264.ins                          | 12 ------------
 CLIENT_DATA/opsi-documentfoundation.libreoffice.ini |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index 955ee00..d4ac5c9 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -81,24 +81,12 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
                 endif
         endif
         if FileExists($IniFile64$)
-                Set $MsiIdLegacyHelpDe64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiIdHelpDe","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
-                if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdLegacyHelpDe64$ + "] DisplayName") = "")
-                        comment "Legacy MSI id " + $MsiIdLegacyHelpDe64$ + " found in registry, starting msiexec to uninstall legacy version"
-                        Winbatch_uninstall_msi_legacy_help_de_64
-                        sub_check_exitcode
-                endif
                 Set $MsiIdOldHelpDe64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiIdHelpDe64","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
                 if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOldHelpDe64$ + "] DisplayName") = "")
                         comment "Old MSI id " + $MsiIdOldHelpDe64$ + " found in registry, starting msiexec to uninstall old version"
                         Winbatch_uninstall_msi_old_help_de_64
                         sub_check_exitcode
                 endif
-                Set $MsiIdLegacy64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
-                if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdLegacy64$ + "] DisplayName") = "")
-                        comment "Legacy MSI id " + $MsiIdLegacy64$ + " found in registry, starting msiexec to uninstall legacy version"
-                        Winbatch_uninstall_msi_legacy_64
-                        sub_check_exitcode
-                endif
                 Set $MsiIdOld64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiId64","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
                 if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld64$ + "] DisplayName") = "")
                         comment "Old MSI id " + $MsiIdOld64$ + " found in registry, starting msiexec to uninstall old version"
diff --git a/CLIENT_DATA/opsi-documentfoundation.libreoffice.ini b/CLIENT_DATA/opsi-documentfoundation.libreoffice.ini
index 96521fd..259a778 100644
--- a/CLIENT_DATA/opsi-documentfoundation.libreoffice.ini
+++ b/CLIENT_DATA/opsi-documentfoundation.libreoffice.ini
@@ -1,6 +1,6 @@
 [X86]
-MsiId={8EA569F1-97AF-4C3E-A0CB-4846C2D35A81}
-MsiIdHelpDe={766DEEF2-5E05-42EF-B4BC-1BB0D2888229}
+MsiId32={8EA569F1-97AF-4C3E-A0CB-4846C2D35A81}
+MsiIdHelpDe32={766DEEF2-5E05-42EF-B4BC-1BB0D2888229}
 
 
 [COMMON]