use prompt in rxvt too; better ssh-agent logic

diff --git a/.bashrc b/.bashrc
index eebab56bf4cef9bcd79f6512548d6ce02dcd16d6..8622e18c02ab267a002454a80acd150796a8b1cb 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -29,6 +29,7 @@ if [ "$PS1" ]; then
     alias emc='sane_editor'
 
     # set a fancy prompt
     alias emc='sane_editor'
 
     # 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\]
 
     PS1="\[\033[0;36m\]\h \t \w$\[\033[0m\] "
     # \[\033[1;36m\][\w]\n\[\033[0;36m\][\h|\t]$ \[\033[0m\]
 


@@ -37,6 +38,10 @@ if [ "$PS1" ]; then
        screen|xterm*)
             PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
             ;;
        screen|xterm*)
             PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
             ;;

+       rxvt*)
+            PROMPT_COMMAND='echo -ne "\033]2;${USER}@${HOSTNAME}: ${PWD}\007"'
+            ;;
+

        *)
             ;;
     esac
        *)
             ;;
     esac


@@ -49,11 +54,13 @@ if [ "$PS1" ]; then
 
     # set up ssh-agent
     if which ssh-agent >/dev/null && [ -d ~/.ssh ]; then
 
     # set up ssh-agent
     if which ssh-agent >/dev/null && [ -d ~/.ssh ]; then

+#      for 

        if [ -e ~/.ssh/ssh_agent_info ] && \
        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) ] && \
            . ~/.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)
            . ~/.ssh/ssh_agent_info_$(hostname) > /dev/null
        else
            ssh-agent -s > ~/.ssh/ssh_agent_info_$(hostname)