From f7b6fbe1439f9c628c1ed50c88880f156e17c53f Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@aconit.easter-eggs.fr>
Date: Fri, 13 Nov 2009 18:14:14 +0100
Subject: [PATCH] upgradeFromGit/buildDocExports : fix bugs

---
 buildDocExports.sh | 17 +++++++++--------
 upgradeFromGit.sh  |  8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/buildDocExports.sh b/buildDocExports.sh
index 601be55a..df6b1afe 100755
--- a/buildDocExports.sh
+++ b/buildDocExports.sh
@@ -1,15 +1,16 @@
 #!/bin/sh
 
 ROOT_DIR=$( cd `dirname $0`; pwd )
+LOCAL_CFG_DIR=$ROOT_DIR/config.local
 
 # Import config
-if [ ! -f $LOCAL_SAV_DIR/local.sh ]
+if [ ! -f $LOCAL_CFG_DIR/local.sh ]
 then
     echo "Error : You don't have create your own local.sh file in config.local directory. You could rely on the local.sh.example file to create your version."
     exit 1
 fi
 
-source $LOCAL_SAV_DIR/local.sh
+source $LOCAL_CFG_DIR/local.sh
 
 if [ ! -n "$EXPORT_DOC_DIR" ]
 then
@@ -21,7 +22,7 @@ DOC_DIR=$ROOT_DIR/doc
 TMP_DIR=`mktemp -d`
 ERROR=0
 
-echo "Export documentation in $EXPORT_DOC_DIR :"
+echo "-> Export documentation in $EXPORT_DOC_DIR :"
 
 # PDF
 if [ -n "$PDF" ]
@@ -55,7 +56,7 @@ then
     mkdir $TMP_DIR/$ALL_IN_ONE/styles
     cp $CSS $TMP_DIR/$ALL_IN_ONE/styles/
 
-    echo "Build archive and move it later ..."
+    echo "done. Build archive and move it later ..."
 fi
 
 
@@ -75,7 +76,7 @@ then
     mkdir $TMP_DIR/$ONLINE/styles
     cp $CSS $TMP_DIR/$ONLINE/styles/
 
-    echo "Build archive and move it later ..."
+    echo "done. Build archive and move it later ..."
 fi
 
 
@@ -98,10 +99,10 @@ then
     	cp $i $TMP_DIR/$DOCBOOK/$i
     done
     
-    echo "Build archive and move it later ..."
+    echo "done. Build archive and move it later ..."
 fi
 
-echo "Build archives and move all in export directory :"
+echo "-> Build archives and move all in export directory :"
 cd $TMP_DIR/
 for i in $ALL_IN_ONE $ONLINE $DOCBOOK
 do
@@ -129,7 +130,7 @@ done
 
 if [ -n "$LAST_UPDATE_FILE" ]
 then
-    echo -n "Create last-update file : "
+    echo -n "-> Create last-update file : "
     echo "Last update :" > $LAST_UPDATE_FILE
     date >> $LAST_UPDATE_FILE
     echo >> $LAST_UPDATE_FILE
diff --git a/upgradeFromGit.sh b/upgradeFromGit.sh
index 9dbd9914..d439ba7f 100755
--- a/upgradeFromGit.sh
+++ b/upgradeFromGit.sh
@@ -19,7 +19,7 @@ function msg() {
 
 cd $ROOT_DIR
 
-msg "Clean git repos : "
+msg "-> Clean git repos : "
 for i in $LOCAL_FILES
 do
 	msg "\t-> $i : " -en
@@ -77,7 +77,7 @@ then
   fi
 fi
 
-msg "Verification of git repos state : "
+msg "-> Verification of git repos state : "
 git status >> $LOG_FILE 2>&1
 if [ "$ETAT" != "" ]
 then
@@ -86,7 +86,7 @@ then
 fi
 msg "\t->[OK]" -e
 
-msg "Upgrade git repos : "
+msg "-> Upgrade git repos : "
 RES_GIT=`git pull`
 RES=$?
 msg "$RES_GIT" -e
@@ -97,7 +97,7 @@ then
 fi
 msg "\t-> [OK]" -e
 
-msg "Install local files : "
+msg "-> Install local files : "
 for i in $LOCAL_FILES
 do
 	msg "\t-> $i : " -ne