Merge branch 'master' into perso

[config-20-100.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index a5398597a697d5b59ffadcddf061fe05b0eead50..056648669e183a16ef4d5d7c4dd6b50afc5c5cc4 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -92,7 +92,7 @@ vcs_formats(){
         msg="${msg}${nocolor_prompt}|${vcs_action_color}%s"
         msg=$(printf $msg $action)
     fi
-    msg="${msg}${vcs_symbols_color}]${nocolor_prompt}${MINUS_CHAR}"
+    msg="${msg}${vcs_symbols_color}]${line_color_prompt}${MINUS_CHAR}"
     msgs[0]=$msg
 
     return 0
@@ -400,7 +400,7 @@ vcs_info(){
         if [[ disabled[${vcss[$i]}] -eq 1 ]]; then
             continue
         fi
-        commands[${vcss[$i]}]=$(which ${vcss[$i]});
+        commands[${vcss[$i]}]=$( (which ${vcss[$i]} 2>/dev/null >&2 && which ${vcss[i]})||echo true);
     done;
 
     found=0
@@ -640,10 +640,10 @@ function welcome_message ()
 export HISTCONTROL=ignoreboth
 
 # Nombre de lignes d'historique à garder
-export HISTSIZE=""
+export HISTSIZE="10000"
 
 # la même chose dans le fichier d'historique
-export HISTFILESIZE=""
+export HISTFILESIZE="100000"
 
 # Mémoriser le timestamp d'exécution de la commande
 export HISTTIMEFORMAT='%F %T - '