From 713f5e1af51ad30e580f107951b4139ac3045e2d Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 23 Oct 2017 10:59:59 +0200
Subject: [PATCH] Remove the x86 variant before installing the x64 one

---
 packages/firefox.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/firefox.xml b/packages/firefox.xml
index 3fa3ed0..c3e5355 100644
--- a/packages/firefox.xml
+++ b/packages/firefox.xml
@@ -16,6 +16,8 @@
             <exit code="-1073741515" />
             <exit code="128" />
         </install>
+        <!-- Remove x86 on x64 boxes, but ony if present -->
+        <install architecture="x64" cmd='%COMSPEC% /C if exist "%PROGRAMFILES(x86)%\Mozilla Firefox\uninstall\helper.exe" "%PROGRAMFILES(x86)%\Mozilla Firefox\uninstall\helper.exe" -ms' />
 	<install architecture="x86" cmd='"%SOFTWARE%\x86\firefox\Firefox Setup %PKG_VERSION%%VARIANTE%.exe" -ms' />
 	<install architecture="x64" cmd='"%SOFTWARE%\x64\firefox\Firefox Setup %PKG_VERSION%%VARIANTE%.exe" -ms' />
         <!-- Empeche l'affichage d'un message d'erreur lors de l'ouverture d'une URL depuis un fichier .bat -->