X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=blobdiff_plain;f=.bashrc;h=c5e734700f60bcc4542681ea02c9df9489ec6405;hp=968474abf171aedbc8aab90a4cc4a108c3baed48;hb=760346882ebd26fcfc4192bebb1c8adf5f6221b8;hpb=ab34617c4c4c817b55a76fe24c503263eab94629

diff --git a/.bashrc b/.bashrc
index 968474a..c5e7347 100644
--- 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
@@ -147,8 +147,9 @@ git_detect(){
 # Mercurial isn't
 hg_detect(){
     check_command hg || return 1
-    vcs_comm[basedir]="$(hg root 2> /dev/null)" || return 1
-    return 0
+    vcs_comm[detect_need_file]=store
+    detect_by_dir '.hg'
+    return $?
 }
 
 # .svn in each directories
@@ -160,7 +161,6 @@ svn_detect() {
 
 bzr_detect(){
     check_command bzr || return 1
-#    vcs_comm[basedir]=$(bzr root 2>/dev/null) || return 1
     vcs_comm[detect_need_file]=branch/format
     detect_by_dir '.bzr'
     return $?
@@ -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
@@ -548,13 +548,13 @@ function prompt_command
         # Attention "\\\$" devient \$, c'est-à-dire # pour root, $ pour les autres
         PROMPT="${username_color}\u${symbols_color}@${host_color}\h ${symbols_color}\\\$ ${nocolor_prompt}"
         # On fusionne tout ça
-        PS1=$TITLE${line_color_prompt}$MINUS_CHAR$DATE$MINUS_CHAR$DIR$MINUS_CHAR$VCS_info${line_color_prompt}$POST_DIR$ERR'\n'$PROMPT
+        PS1=$TITLE${line_color_prompt}$MINUS_CHAR$DATE$MINUS_CHAR$DIR$MINUS_CHAR${line_color_prompt}$POST_DIR$VCS_info$ERR'\n'$PROMPT
     else
         DIR="< "$DIR" >"
         ERR='[ $? ]'$MINUS_CHAR
         DATE="( \D{%H:%M:%S} )"
         PROMPT="\u@\h \\\$ "
-        PS1=$TITLE$MINUS_CHAR$DATE$MINUS_CHAR$DIR$MINUS_CHAR$VCS_info$POST_DIR$ERR'\n'$PROMPT
+        PS1=$TITLE$MINUS_CHAR$DATE$MINUS_CHAR$DIR$MINUS_CHAR$POST_DIR$VCS_info$ERR'\n'$PROMPT
     fi
 }
 
@@ -595,7 +595,7 @@ else
     TITLE=''
 fi
 
-# On regénére le prompt après chaque commande
+# On régénére le prompt après chaque commande
 PROMPT_COMMAND=prompt_command
 
 # +-------------------+