From 472ad2431d0211732496a5b0d286117c45462b79 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 5 Jun 2012 18:22:57 +0200
Subject: [PATCH] =?UTF-8?q?remont=C3=A9=20des=20logs=20fusioninventory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/logs.xml | 5 ++++-
 wpkg-logs.spec    | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/logs.xml b/packages/logs.xml
index 2f01b8d..82442b1 100755
--- a/packages/logs.xml
+++ b/packages/logs.xml
@@ -2,14 +2,17 @@
 <packages>
     <package id="logs"
              name="Journaux d'installation"
-             revision="8"
+             revision="9"
              priority="1"
              execute="always">
 
         <install timeout="5" cmd='%COMSPEC% /C if not exist "%WPKGLOGS%\logs" mkdir %WPKGLOGS%\logs' />
         <install timeout="5" cmd='%COMSPEC% /C if not exist "%WPKGLOGS%\databases" mkdir %WPKGLOGS%\databases' />
+        <install timeout="5" cmd='%COMSPEC% /C if not exist "%WPKGLOGS%\databases" mkdir %WPKGLOGS%\fusioninventory' />
         <install timeout="15" cmd='%COMSPEC% /C copy /Y "%SYSTEMROOT%\system32\wpkg.xml" "%WPKGLOGS%\databases\%COMPUTERNAME%.xml"' />
         <install timeout="15" cmd='%COMSPEC% /C copy /Y "%TEMP%\wpkg-%COMPUTERNAME%.log" "%WPKGLOGS%\logs\%COMPUTERNAME%.log"' />
+        <install architecture='x86' timeout="15" cmd='%COMSPEC% /C if exists "%PROGRAMFILES%\FusionInventory-Agent\agent-log.txt" copy /Y "%PROGRAMFILES%\FusionInventory-Agent\agent-log.txt" "%WPKGLOGS%\fusioninventory\%COMPUTERNAME%.txt"' />
+        <install architecture='x64' timeout="15" cmd='%COMSPEC% /C if exists "%PROGRAMFILES(x86)%\FusionInventory-Agent\agent-log.txt" copy /Y "%PROGRAMFILES(x86)%\FusionInventory-Agent\agent-log.txt" "%WPKGLOGS%\fusioninventory\%COMPUTERNAME%.txt"' />
         <upgrade include="install" />
         <downgrade include="install" />
     </package>
diff --git a/wpkg-logs.spec b/wpkg-logs.spec
index 8c825c0..84fa0cf 100644
--- a/wpkg-logs.spec
+++ b/wpkg-logs.spec
@@ -1,6 +1,6 @@
 %define package logs
 %define version 0.1
-%define realversion 0.1
+%define realversion 0.2
 %define release 0.beta1
 
 Name:		wpkg-%{package}
@@ -42,6 +42,9 @@ cp -r packages/* %{buildroot}/home/e-smith/files/shares/wpkg/files/packages/
 /bin/rm -rf %{buildroot}
 
 %changelog
-* Tue Jun 5 2012 Daniel Berteaud <daniel@firewall-services.com>
+* Tue Jun 5 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1+0.2-1
+- Copy fusioninventory-agent logs
+
+* Tue Jun 5 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1+0.1-1
 - initial release