X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Fps1.bashrc;h=b65e42d8447e3c3b91a00d4ddec329ed548ae59a;hb=b3d373ad52b5671234fbe6361e509fef08ac2111;hp=50dd723a987b9c6f21da0db63c9ec8c0c3fe615a;hpb=69660d7ffcf12c1da215713e613f759e4abf2bec;p=profile.git

diff --git a/.profile.d/ps1.bashrc b/.profile.d/ps1.bashrc
index 50dd723..b65e42d 100644
--- a/.profile.d/ps1.bashrc
+++ b/.profile.d/ps1.bashrc
@@ -42,29 +42,30 @@
 # Failed: dark red.
 # Git: royal blue.
 # P4: yellow.
+# SVN: magenta.
 case $(tput colors) in
   256)
-    export PROMPT_OK_COLOUR="1;38;5;34"
-    export PROMPT_FAILED_COLOUR="1;38;5;160"
-    export GIT_COLOUR="0;38;5;33"
-    export SVN_COLOUR="0;38;5;127"
-    export P4_COLOUR="0;38;5;142"
+    PROMPT_OK_COLOUR="1;38;5;34"
+    PROMPT_FAILED_COLOUR="1;38;5;160"
+    GIT_COLOUR="0;38;5;33"
+    SVN_COLOUR="0;38;5;127"
+    P4_COLOUR="0;38;5;142"
   ;;
 
   88)
-    export PROMPT_OK_COLOUR="1;38;5;24"
-    export PROMPT_FAILED_COLOUR="1;38;5;48"
-    export GIT_COLOUR="0;38;5;23"
-    export SVN_COLOUR="0;38;5;49"
-    export P4_COLOUR="0;38;5;56"
+    PROMPT_OK_COLOUR="1;38;5;24"
+    PROMPT_FAILED_COLOUR="1;38;5;48"
+    GIT_COLOUR="0;38;5;23"
+    SVN_COLOUR="0;38;5;49"
+    P4_COLOUR="0;38;5;56"
   ;;
 
   *)
-    export PROMPT_OK_COLOUR="1;32"
-    export PROMPT_FAILED_COLOUR="1;31"
-    export GIT_COLOUR="0;36"
-    export SVN_COLOUR="0;35"
-    export P4_COLOUR="0;33"
+    PROMPT_OK_COLOUR="1;32"
+    PROMPT_FAILED_COLOUR="1;31"
+    GIT_COLOUR="0;36"
+    SVN_COLOUR="0;35"
+    P4_COLOUR="0;33"
   ;;
 esac
 
@@ -72,13 +73,28 @@ function __ps1() {
   # Default __ps1_user to 1.
   [ -z "$__ps1_user" ] && __ps1_user=1
 
-  export PS1='$(__ps1_user $? \u@)\[\033[$(__ps1_col $? 2>/dev/null)m\]$(__ps1_user $? \h)\[\033[${GIT_COLOUR}m\]$(__ps1_git $? 2>/dev/null)\[\033[0m\]\[\033[${P4_COLOUR}m\]$(__ps1_p4 $? 2>/dev/null)\[\033[0m\]\[\033[${SVN_COLOUR}m\]$(__ps1_svn $? 2>/dev/null)\[\033[0m\]$(__ps1_ret $? 2>/dev/null):\w\$ '
+  PS1='$(__ps1_user $? \u@)\[\033[$(__ps1_col $? 2>/dev/null)m\]$(__ps1_user $? \h)\[\033[$(__ps1_colour_escape $? $GIT_COLOUR)m\]$(__ps1_git $? 2>/dev/null)\[\033[0m\]\[\033[$(__ps1_colour_escape $? $P4_COLOUR)m\]$(__ps1_p4 $? 2>/dev/null)\[\033[0m\]\[\033[$(__ps1_colour_escape $? $SVN_COLOUR)m\]$(__ps1_svn $? 2>/dev/null)\[\033[0m\]$(__ps1_ret $? 2>/dev/null):\w\$ '
   return 0
 }
 
+# iTerm doesn't like it if you set bold and colour at the same time.
+function __ps1_colour_escape() {
+  local ret=$1; shift
+  local bold="${1%%;*}"
+  local colour="${1#*;}"
+
+  echo -en "${bold}m\033[$colour"
+  return $ret
+}
+
 function __ps1_col() {
-  [ $1 -gt 0 ] && echo -n "$PROMPT_FAILED_COLOUR" || echo -n "$PROMPT_OK_COLOUR"
-  return $1
+  local ret=$1; shift
+  if [ $ret -gt 0 ]; then
+    __ps1_colour_escape $ret "$PROMPT_FAILED_COLOUR"
+  else
+    __ps1_colour_escape $ret "$PROMPT_OK_COLOUR"
+  fi
+  return $ret
 }
 
 function __ps1_ret() {