From 38b7e587f5eb4754f99682b9b2b1a858052a41a3 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 27 Aug 2013 16:02:41 +0200
Subject: [PATCH] Fix package definition for 2.3.0

---
 packages/fusioninventory.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/fusioninventory.xml b/packages/fusioninventory.xml
index 117319e..80a0c4c 100755
--- a/packages/fusioninventory.xml
+++ b/packages/fusioninventory.xml
@@ -2,15 +2,16 @@
 <packages>
     <package id="fusioninventory"
              name="Agent d'inventaire reseau"
-             revision="18"
+             revision="18.5"
              priority="10">
 
         <variable name="PKG_VERSION" value="2.3.0-1" />
         <variable name="INSTALL_PATH" value="%PROGRAMFILES%\FusionInventory-Agent\" />
-        <variable name="INSTALL_FLAGS" value="/S /acceptlicense /execmode=Service /httpd-ip=127.0.0.1 installtype=/from-scratch /no-p2p /user='%FUSINV_USER%' /password='%FUSINV_PASS%' /server='%FUSINV_SERVER%'" />
+        <variable name="INSTALL_FLAGS" value='/acceptlicense /user="%FUSINV_USER%" /password="%FUSINV_PASS%" /server="%FUSINV_SERVER%" /ca-cert-file="%INSTALL_PATH%\certs\cacert.pem" /execmode=Service /installtype=from-scratch /S' />
  
-	<check type="uninstall" condition="versiongreaterorequal" path="FusionInventory Agent" value="%PKG_VERSION%" />
+	<check type="uninstall" condition="versiongreaterorequal" path="FusionInventory Agent %PKG_VERSION%.*" value="%PKG_VERSION%" />
 
+        <install cmd='%COMSPEC% /C copy /Y "%SETTINGS%\fusioninventory\cacert.pem" "%INSTALL_PATH%\certs\cacert.pem"' />
         <install architecture="x86" cmd='%SOFTWARE%\fusioninventory\fusioninventory-agent_windows-x86_%PKG_VERSION%.exe %INSTALL_FLAGS%' />
         <install architecture="x64" cmd='%SOFTWARE%\fusioninventory\fusioninventory-agent_windows-x64_%PKG_VERSION%.exe %INSTALL_FLAGS%' />
  
@@ -18,6 +19,6 @@
 
         <downgrade include="install" />
  
-        <remove cmd='"%INSTALL_PATH%\uninstFI.exe" /S' />
+        <remove cmd='"%INSTALL_PATH%\Uninstall.exe" /S _?=%INSTALL_PATH%' />
     </package>
 </packages>