X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Fprompt.bashrc;h=cf133c7725cbc8835751151d175e4817621f833d;hb=31189bc241721bf1e1b38dd31875fa6093b64e74;hp=ca55679c7751e2299bc28e0a36402685cad79966;hpb=31192e260dfbbee3487b6f0623c70b516149743a;p=profile.git

diff --git a/.profile.d/prompt.bashrc b/.profile.d/prompt.bashrc
index ca55679..cf133c7 100644
--- a/.profile.d/prompt.bashrc
+++ b/.profile.d/prompt.bashrc
@@ -5,7 +5,7 @@
 
 SSH_FORWARDED=$(get_remote_ip -n)
 if [ ! -z "$SSH_FORWARDED" ]; then
-  if [ ! "$SSH_FORWARDED" = "62.189.242.202" -a ! "$SSH_FORWARDED" = "62.189.241.202" ]; then
+  if [ ! "$SSH_FORWARDED" = "62.189.242.202" -a ! "$SSH_FORWARDED" = "62.189.241.202" -a ! "$SSH_FORWARDED" = "193.128.72.68" -a ! "$SSH_FORWARDED" = "localhost" ]; then
     SSH_FORWARDED=" (from $SSH_FORWARDED)"
   else
     SSH_FORWARDED=
@@ -14,7 +14,7 @@ fi
 
 # Unscientific check for grid jobs.
 case ${SSH_CLIENT##* } in
-  22|2222);;
+  ""|22|2222);;
   *) SSH_FORWARDED="$SSH_FORWARDED [grid]"
 esac
 
@@ -28,5 +28,9 @@ if ps -o comm= -p $PPID 2>/dev/null | grep '^vim*$' &>/dev/null; then
   info="$info$vimchild"
 fi
 blank=$(echo "$info" | sed 's/./ /g')
-export PROMPT_COMMAND="echo -ne '\033]0;$info\007\r$blank \r'"
+if [ "${TERM##screen}" = "$TERM" ]; then
+  export PROMPT_COMMAND="echo -ne '\033]0;$info\007\r$blank \r'"
+else
+  export PROMPT_COMMAND='echo -ne "\033k\033\\"'
+fi
 unset blank info vimchild SSH_FORWARDED