User Tools

Site Tools


bashrc

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
bashrc [2010/04/21 16:31]
91.64.124.84
bashrc [2010/04/28 20:45] (current)
92.195.193.18
Line 3: Line 3:
 This is my ''​.bashrc''​ This is my ''​.bashrc''​
  
-<code bash>+<code bash bashrc>
 # Andi's .bashrc # Andi's .bashrc
  
Line 53: Line 53:
   parse_git_branch() {   parse_git_branch() {
     git branch 2> /dev/null | sed -e '/​^[^*]/​d'​ -e 's/* \(.*\)/​\[\1\]/'​     git branch 2> /dev/null | sed -e '/​^[^*]/​d'​ -e 's/* \(.*\)/​\[\1\]/'​
 +  }
 +  # has current branch unrecorded changes?
 +  # http://​markelikalderon.com/​2009/​01/​16/​dirty-prompts/​
 +  parse_git_dirty() {
 +    git diff --quiet HEAD &>/​dev/​null
 +    [[ $? == 1 ]] && echo "​*"​
   }   }
  
   # set a fancy prompt and xterm title   # set a fancy prompt and xterm title
   shopt -s checkwinsize   shopt -s checkwinsize
-  if [ ! -"$COLORTERM" ]; then+  if [ "​$COLORTERM" ​!= "" ​-"$TERM" == "xterm" ]; then
     if [ "​$USER"​ == "​root"​ ]; then     if [ "​$USER"​ == "​root"​ ]; then
-      PS1="\[\033]2;\w\007\]\[\033[0;31m\]\u@\h:\w\\$\[\033[0;37m\] "+      PS1='\[\e[0;31m\]\u@\h\[\e[0;35m\]$(parse_git_branch)$(parse_git_dirty)\[\e[0;31m\]:\w\$\[\e[0m\] '
     else     else
-      PS1='​\[\033]2;​\w\007\]\[\033[0;​32m\]\u@\h\[\033[00;​35m\]$(parse_git_branch)\[\033[0;32m\]:\w\\$\[\033[0;37m\] '+      PS1='​\[\e[0;​32m\]\u@\h\[\e[0;​35m\]$(parse_git_branch)$(parse_git_dirty)\[\e[0;​32m\]:​\w\$\[\e[0m\] ' 
     fi     fi
   else   else
Line 72: Line 79:
   fi   fi
  
-  # ssh keymanager - see http://notes.splitbrain.org/​ssh +  # ssh keymanager - see http://wiki.splitbrain.org/​ssh 
-  if [ -e /​usr/​bin/​keychain ]; then+  if [ -e /​usr/​bin/​keychain ​-a -e ~/​.ssh/​id_dsa ​]; then
     keychain -q ~/​.ssh/​id_dsa     keychain -q ~/​.ssh/​id_dsa
     if [ -e ~/​.ssh-agent-${HOSTNAME} ]; then     if [ -e ~/​.ssh-agent-${HOSTNAME} ]; then
Line 82: Line 89:
     fi     fi
   fi   fi
-  # use zssh if available 
-  if [ -e /​usr/​bin/​zssh ]; then alias ssh='​zssh';​ fi 
  
   # daily temp dir   # daily temp dir
Line 104: Line 109:
   # print a fortune cookie   # print a fortune cookie
   if which fortune >/​dev/​null;​ then   if which fortune >/​dev/​null;​ then
-    if [ -z "​$COLORTERM"​ ]; then +    if [ "​$COLORTERM" != ""​ -o "​$TERM"​ == "xterm" ]; then
-      fortune -a -s +
-    else+
       echo -en "​\033[0;​36m"​       echo -en "​\033[0;​36m"​
       fortune -a -s       fortune -a -s
       echo -en "​\033[0;​37m"​       echo -en "​\033[0;​37m"​
 +    else
 +      fortune -a -s
     fi     fi
   fi   fi
bashrc.txt · Last modified: 2010/04/28 20:45 by 92.195.193.18