* Handle older versions of toe

[home-base.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 5f3c7da67c5be696fc47a675dc6d09088f57e310..189377b4025a45c57a279a772cd022cae57aadad 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -28,15 +28,41 @@ if [ "$PS1" ]; then
     alias gr='gimp-remote-2.2'
     alias emc='sane_editor'
 
+    alias svn-b="svn-buildpackage --svn-builder 'pdebuild --buildresult ..' --svn-ignore-new"
+
     # set a fancy prompt
+    #printf '\33]2;%s\007'
     PS1="\[\033[0;36m\]\h \t \w$\[\033[0m\] "
     # \[\033[1;36m\][\w]\n\[\033[0;36m\][\h|\t]$ \[\033[0m\]
 
+    # make sure the term we're using exists in the termcap
+    TOEOPT='-a'
+    if ! toe $TOEOPT >/dev/null 2>&1; then
+       TOEOPT=''
+    fi;
+    if ! toe $TOEOPT|grep -q "^$TERM   "; then
+       # if it doesn't, try to switch
+       case $TERM in
+           rxvt*)
+               TERM="rxvt"
+               ;;
+           xterm*)
+               TERM="xterm"
+               ;;
+           *)
+               ;;
+       esac
+       export TERM;
+    fi;
     # If this is an xterm set the title to user@host:dir
     case $TERM in
        screen|xterm*)
             PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
             ;;
+       rxvt*)
+            PROMPT_COMMAND='echo -ne "\033]2;${USER}@${HOSTNAME}: ${PWD}\007"'
+            ;;
+
        *)
             ;;
     esac
@@ -46,6 +72,22 @@ if [ "$PS1" ]; then
     if [ -f /etc/bash_completion ]; then
       . /etc/bash_completion;
     fi;
+
+    # set up ssh-agent
+    if which ssh-agent >/dev/null && [ -d ~/.ssh ]; then
+#      for 
+       if [ -e ~/.ssh/ssh_agent_info ] && \
+           [ -n "$(awk -F '[=;]' '/^SSH_AGENT_PID/{print $2}' ~/.ssh/ssh_agent_info)" ] && \
+           kill -0 "$(awk -F '[=;]' '/^SSH_AGENT_PID/{print $2}' ~/.ssh/ssh_agent_info)" >/dev/null 2>&1; then
+           . ~/.ssh/ssh_agent_info > /dev/null
+       elif [ -e ~/.ssh/ssh_agent_info_$(hostname) ] && \
+           kill -0 "$(awk -F '[=;]' '/^SSH_AGENT_PID/{print $2}' ~/.ssh/ssh_agent_info_$(hostname))" >/dev/null 2>&1; then
+           . ~/.ssh/ssh_agent_info_$(hostname) > /dev/null
+       else
+           ssh-agent -s > ~/.ssh/ssh_agent_info_$(hostname)
+           . ~/.ssh/ssh_agent_info_$(hostname) > /dev/null
+       fi;
+    fi;
     
     alias aumix2='aumix -d /dev/mixer1 -I'
     if locale -a |grep -qi en_US.utf8; then