X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=.bashrc;h=225aa9ab826fa93980abc61b4804d8bfc874317c;hb=79abc3e0705b25a24a60d8ddd2070a2d5228711b;hp=679c3a6e1749ce5697a43d4998fa90af39d647f9;hpb=c32987ef36b97a31620019b27d3df2d97d6ffe08;p=config-20-100.git

diff --git a/.bashrc b/.bashrc
index 679c3a6..225aa9a 100644
--- a/.bashrc
+++ b/.bashrc
@@ -100,7 +100,7 @@ function cd {
         builtin cd "$@"
 	ret=$?
         if [ -f ~/.umaskrc ]; then
-            umask $(/usr/bin/awk 'BEGIN {pwd=ENVIRON["PWD"]; a=length(pwd); cmax=0} {if($1==pwd) {MASK=$2;exit}; c=length($1); if(c>a) {next}; if(substr(pwd,0,c)==$1 && c > cmax) {cmax=c; MASK=$2}} END {print MASK}' ~/.umaskrc) >/dev/null
+            umask $(/usr/bin/awk 'BEGIN {pwd=ENVIRON["PWD"]"/"; a=length(pwd); cmax=0} {if($1==pwd) {MASK=$2;exit}; c=length($1); if(c>a) {next}; if(substr(pwd,0,c+1)==$1 && c > cmax) {cmax=c; MASK=$2}} END {print MASK}' ~/.umaskrc) >/dev/null
         fi
         return $ret
 }
@@ -224,7 +224,7 @@ function prompt_command
         # il faut changer $((31+($?==0)*6)) si vous y tenez vraiment et que vous comprenez ce que vous faites
         ERR='[ \[\e[1;$((31+($?==0)*6))m\]$?'${line_color_prompt}' ]'$MINUS_CHAR
         DATE="( ${date_color}\D{%H:%M:%S}${line_color_prompt} )"
-        PROMPT="${username_color}\u${symbols_color}@${host_color}\h ${symbols_color}\$ ${nocolor_prompt}"
+        PROMPT="${username_color}\u${symbols_color}@${host_color}\h ${symbols_color}\\\$ ${nocolor_prompt}"
         PS1=$TITLE${line_color_prompt}$MINUS_CHAR$DATE$MINUS_CHAR$DIR$MINUS_CHAR$VCS_info${line_color_prompt}$POST_DIR$ERR'\n'$PROMPT
     else
         DIR="< "$DIR" >"