* Switch to a TERM that exists if the one we're using doesn't

[home-base.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index eebab56bf4cef9bcd79f6512548d6ce02dcd16d6..99e079c86000d2a7236cc1cd7be2822d862ee87b 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -28,15 +28,37 @@ 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
+    if ! toe -a|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
@@ -49,11 +71,13 @@ if [ "$PS1" ]; then
 
     # set up ssh-agent
     if which ssh-agent >/dev/null && [ -d ~/.ssh ]; then
+#      for 
        if [ -e ~/.ssh/ssh_agent_info ] && \
-           kill -0 "$(awk -F '[=;]' '/^SSH_AGENT_PID/{print $2}' ~/.ssh/ssh_agent_info)"; then
+           [ -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))"; then
+           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)