From 21699effe5893b440c1e92c1c191b79556877866 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Thu, 17 Apr 2014 10:35:01 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20date=20plus=20compl=C3=A8te?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 indexer/indexerAct.sh       | 4 ++--
 indexer/indexerDiri.sh      | 5 ++---
 indexer/indexerEtab.sh      | 4 ++--
 scripts/build/configure.php | 9 +++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/indexer/indexerAct.sh b/indexer/indexerAct.sh
index 81900b8..95fa4c4 100644
--- a/indexer/indexerAct.sh
+++ b/indexer/indexerAct.sh
@@ -2,6 +2,6 @@
 PATH_BIN=/usr/local/sphinx/bin
 PATH_LOG=/dbs/sphinxlog
 
-echo "DEBUT de l'indexation ==== $(date +%H:%M:%S)" >> $PATH_LOG/indexer.log
+echo "$(date '+%Y-%m-%d %H:%M:%S') === DEBUT de l'indexation" >> $PATH_LOG/indexer.log
 $PATH_BIN/indexer --rotate act >> $PATH_LOG/indexer.log
-echo "FIN ===== $(date +%H:%M:%S)" >> $PATH_LOG/indexer.log
+echo "$(date '+%Y-%m-%d %H:%M:%S') === FIN" >> $PATH_LOG/indexer.log
diff --git a/indexer/indexerDiri.sh b/indexer/indexerDiri.sh
index 8a456a7..247bf80 100755
--- a/indexer/indexerDiri.sh
+++ b/indexer/indexerDiri.sh
@@ -3,8 +3,7 @@ PATH_BIN=/usr/local/sphinx/bin
 PATH_LOG=/dbs/sphinxlog
 PATH_SQL=/home/scripts/indexer/sql
 
-
-echo "DEBUT de l'indexation ==== $(date +%H:%M:%S)" >> $PATH_LOG/indexer.log
+echo "$(date '+%Y-%m-%d %H:%M:%S') === DEBUT de l'indexation" >> $PATH_LOG/indexer.log
 
 # nombre de lignes dans la table etab
 output=$(mysql -h192.168.3.30 -usphinx -pindexer jo < $PATH_SQL/countDiri.sql)
@@ -37,4 +36,4 @@ else
         echo "Il n'y a pas assez de lignes dans la nouvelle table dirigeants ($etab_tmp / $etab) !" >> $PATH_LOG/indexer.log
 fi
 
-echo "FIN ===== $(date +%H:%M:%S)" >> $PATH_LOG/indexer.log
+echo "$(date '+%Y-%m-%d %H:%M:%S') === FIN" >> $PATH_LOG/indexer.log
diff --git a/indexer/indexerEtab.sh b/indexer/indexerEtab.sh
index f1d91f3..cdeb932 100755
--- a/indexer/indexerEtab.sh
+++ b/indexer/indexerEtab.sh
@@ -3,7 +3,7 @@ PATH_BIN=/usr/local/sphinx/bin
 PATH_LOG=/dbs/sphinxlog
 PATH_SQL=/home/scripts/indexer/sql
 
-echo "DEBUT de l'indexation ==== $(date +%H:%M:%S)" >> $PATH_LOG/indexer.log
+echo "$(date '+%Y-%m-%d %H:%M:%S') === DEBUT de l'indexation" >> $PATH_LOG/indexer.log
 
 # nombre de lignes dans la table etab
 output=$(mysql -h192.168.3.30 -usphinx -pindexer jo < $PATH_SQL/countEtab.sql)
@@ -40,4 +40,4 @@ else
         echo "Il n'y a pas assez de lignes dans la nouvelle table etablissement ($etab_tmp / $etab) !" >> $PATH_LOG/indexer.log
 fi
 
-echo "FIN ===== $(date +%H:%M:%S)" >> $PATH_LOG/indexer.log
+echo "$(date '+%Y-%m-%d %H:%M:%S') === FIN" >> $PATH_LOG/indexer.log
diff --git a/scripts/build/configure.php b/scripts/build/configure.php
index b42940f..ac69154 100644
--- a/scripts/build/configure.php
+++ b/scripts/build/configure.php
@@ -18,10 +18,11 @@ Configuration :
 $hostname = exec('echo $HOSTNAME');
 
 $SPHINX_VERSION = array(
-	'0.9.9' 	=> array('archive'=>'sphinx-0.9.9.tar.gz', 'dir'=>'sphinx-0.9.9'),
-	'1.10' 		=> array('archive'=>'sphinx-1.10-beta.tar.gz', 'dir'=>'sphinx-1.10-beta'),
-	'2.0.8' 	=> array('archive'=>'sphinx-2.0.8-release.tar.gz', 'dir'=>'sphinx-2.0.8-release'),
-	'2.1.2'	 	=> array('archive'=>'sphinx-2.1.2-release.tar.gz', 'dir'=>'sphinx-2.1.2-release'),
+	'0.9.9'    => array('archive'=>'sphinx-0.9.9.tar.gz', 'dir'=>'sphinx-0.9.9'),
+	'1.10'     => array('archive'=>'sphinx-1.10-beta.tar.gz', 'dir'=>'sphinx-1.10-beta'),
+	'2.0.8'    => array('archive'=>'sphinx-2.0.8-release.tar.gz', 'dir'=>'sphinx-2.0.8-release'),
+	'2.1.2'    => array('archive'=>'sphinx-2.1.2-release.tar.gz', 'dir'=>'sphinx-2.1.2-release'),
+    '2.1.7'    => array('archive'=>'sphinx-2.1.7-release.tar.gz', 'dir'=>'sphinx-2.1.7-release'),
 );
 
 /**