From: Iain Patterson <me@iain.cx>
Date: Mon, 18 Oct 2010 14:30:28 +0000 (+0100)
Subject: Prompt tweaks.
X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=3dd2d01282db09dab72b99d1e291d2d2f0df3cd1;p=profile.git

Prompt tweaks.

Hide : in prompt if only the path should be shown.
Set ROOT_OK_COLOUR and ROOT_FAILED_COLOUR to change the colour of
the # prompt when running as root.
---

diff --git a/.profile.d/ps1.bashrc b/.profile.d/ps1.bashrc
index aa750a0..09a26fc 100644
--- a/.profile.d/ps1.bashrc
+++ b/.profile.d/ps1.bashrc
@@ -7,7 +7,7 @@
 # green if the last command exited 0 or in red otherwise.
 # This part will be shown only if __ps1_user is 1.  By default it is 1.
 # The success and failure colours can be changed by modifying 
-# $PROMPT_OK_COLOUR and $PROMPT_FAILURE_COLOUR respectively.
+# $PROMPT_OK_COLOUR and $PROMPT_FAILED_COLOUR respectively.
 #
 # The second part of the prompt is taken from git-completion.bashrc.
 # It is shown only if __ps1_git is 1.  By default it is 0.
@@ -23,6 +23,8 @@
 # non-zero.
 # 
 # The final part of the prompt is the (full) working directory and $ string.
+# If the shell is running as root the # string's colour can be changed by
+# modifying $ROOT_OK_COLOUR and $ROOT_FAILED_COLOUR.
 #
 # Colouring is performed by the __ps1_col() and __ps1_ret() functions.
 # We redirect stderr to /dev/null when calling these functions to prevent 
@@ -46,6 +48,8 @@ case $(tput colors) in
   256)
     PROMPT_OK_COLOUR="1;38;5;34"
     PROMPT_FAILED_COLOUR="1;38;5;160"
+    ROOT_OK_COLOUR="0"
+    ROOT_FAILED_COLOUR="0"
     GIT_COLOUR="0;38;5;33"
     SVN_COLOUR="0;38;5;127"
     P4_COLOUR="0;38;5;142"
@@ -54,6 +58,8 @@ case $(tput colors) in
   88)
     PROMPT_OK_COLOUR="1;38;5;24"
     PROMPT_FAILED_COLOUR="1;38;5;48"
+    ROOT_OK_COLOUR="0"
+    ROOT_FAILED_COLOUR="0"
     GIT_COLOUR="0;38;5;23"
     SVN_COLOUR="0;38;5;49"
     P4_COLOUR="0;38;5;56"
@@ -62,6 +68,8 @@ case $(tput colors) in
   *)
     PROMPT_OK_COLOUR="1;32"
     PROMPT_FAILED_COLOUR="1;31"
+    ROOT_OK_COLOUR="0"
+    ROOT_FAILED_COLOUR="0"
     GIT_COLOUR="0;36"
     SVN_COLOUR="0;35"
     P4_COLOUR="0;33"
@@ -72,7 +80,7 @@ function __ps1() {
   # Default __ps1_user to 1.
   [ -z "$__ps1_user" ] && __ps1_user=1
 
-  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\$ '
+  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)$(__ps1_colon $?)\w\[\033[$(__ps1_root $? 2>/dev/null)m\]\$\[\033[0m\] '
   return 0
 }
 
@@ -96,6 +104,16 @@ function __ps1_col() {
   return $ret
 }
 
+function __ps1_root() {
+  local ret=$1; shift
+  if [ $ret -gt 0 ]; then
+    __ps1_colour_escape $ret "$ROOT_FAILED_COLOUR"
+  else
+    __ps1_colour_escape $ret "$ROOT_OK_COLOUR"
+  fi
+  return $ret
+}
+
 function __ps1_ret() {
   [ "$__ps1_user" = "1" ] || return $1
   [ $1 -gt 0 ] && echo -n " ($1)"
@@ -139,6 +157,12 @@ function __ps1_svn() {
   return $1
 }
 
+function __ps1_colon() {
+  local all="$__ps1_user$__ps1_git$__ps1_p4$__ps1_svn"
+  [ "${all/1/}" = "$all" ] || echo -n ":"
+  return $1
+}
+
 function prompt() {
   local blurb="Usage: prompt hide|show <what>"