git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Windows 64-bit compatibility.
[profile.git]
/
.profile.d
/
ps1.bashrc
diff --git
a/.profile.d/ps1.bashrc
b/.profile.d/ps1.bashrc
index
50dd723
..
87a2f1b
100644
(file)
--- a/
.profile.d/ps1.bashrc
+++ b/
.profile.d/ps1.bashrc
@@
-42,6
+42,7
@@
# Failed: dark red.
# Git: royal blue.
# P4: yellow.
# Failed: dark red.
# Git: royal blue.
# P4: yellow.
+# SVN: magenta.
case $(tput colors) in
256)
export PROMPT_OK_COLOUR="1;38;5;34"
case $(tput colors) in
256)
export PROMPT_OK_COLOUR="1;38;5;34"
@@
-72,13
+73,28
@@
function __ps1() {
# Default __ps1_user to 1.
[ -z "$__ps1_user" ] && __ps1_user=1
# 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\$ '
+ export 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
}
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() {
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() {
}
function __ps1_ret() {