use words instead of escape codes, some code cleanup

pull/628/head
James Whisnant 2015-12-19 23:28:23 -05:00
parent b52827ed32
commit ddba9555c7
1 changed files with 9 additions and 17 deletions

View File

@ -50,7 +50,7 @@ modern_scm_prompt() {
chroot(){ chroot(){
if [ -n "$debian_chroot" ] if [ -n "$debian_chroot" ]
then then
my_ps_chroot="\[\033[01;36m\]\$debian_chroot\[\033[00m\]"; my_ps_chroot="${bold_cyan}$debian_chroot${normal}";
echo "($my_ps_chroot)"; echo "($my_ps_chroot)";
fi fi
} }
@ -59,28 +59,20 @@ chroot(){
my_ve(){ my_ve(){
if [ -n "$VIRTUAL_ENV" ] if [ -n "$VIRTUAL_ENV" ]
then then
my_ps_ve="\[\033[01;35m\]\$ve\[\033[00m\]"; my_ps_ve="${bold_purple}$ve${normal}";
echo "($my_ps_ve)"; echo "($my_ps_ve)";
fi fi
echo ""; echo "";
} }
prompt() { prompt() {
case $HOSTNAME in my_ps_host="${green}\h${normal}";
"zork"* ) my_ps_host="${green}\h${normal}"; # yes, these are the the same for now ...
;; my_ps_host_root="${green}\h${normal}";
"pandora") my_ps_host="${red}\h${normal}";
;; my_ps_user="${green}\h${normal}"
* ) my_ps_host="${green}\h${normal}"; my_ps_root="${bold_red}\u${normal}";
;;
esac
my_ps_user="\[\033[01;32m\]\u\[\033[00m\]";
my_ps_root="\[\033[01;31m\]\u\[\033[00m\]";
my_ps_path="\[\033[01;36m\]\w\[\033[00m\]";
if [ -n "$VIRTUAL_ENV" ] if [ -n "$VIRTUAL_ENV" ]
then then
@ -89,7 +81,7 @@ prompt() {
# nice prompt # nice prompt
case "`id -u`" in case "`id -u`" in
0) PS1="${TITLEBAR}┌─$(my_ve)$(chroot)[$my_ps_root][$my_ps_host]$(modern_scm_prompt)$(__my_rvm_ruby_version)[${cyan}\w${normal}]$(is_vim_shell) 0) PS1="${TITLEBAR}┌─$(my_ve)$(chroot)[$my_ps_root][$my_ps_host_root]$(modern_scm_prompt)$(__my_rvm_ruby_version)[${cyan}\w${normal}]$(is_vim_shell)
└─▪ " └─▪ "
;; ;;
*) PS1="${TITLEBAR}┌─$(my_ve)$(chroot)[$my_ps_user][$my_ps_host]$(modern_scm_prompt)$(__my_rvm_ruby_version)[${cyan}\w${normal}]$(is_vim_shell) *) PS1="${TITLEBAR}┌─$(my_ve)$(chroot)[$my_ps_user][$my_ps_host]$(modern_scm_prompt)$(__my_rvm_ruby_version)[${cyan}\w${normal}]$(is_vim_shell)