X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.profile.d%2Fprompt.bashrc;h=da94e9713961f88393172d8c7753cde0270e0d7e;hp=e6a8236c27063f0774ba6e92e9bff0dcc2314c52;hb=094bc317ad7d7907a5c87477530db4d24bf1c534;hpb=a3b73b945d5309afe9759b8f8c8de35a2b57a345

diff --git a/.profile.d/prompt.bashrc b/.profile.d/prompt.bashrc
index e6a8236..da94e97 100644
--- a/.profile.d/prompt.bashrc
+++ b/.profile.d/prompt.bashrc
@@ -1,26 +1,48 @@
-# $Id$
-#
-# Set the title of an xterm to the hostname.
-#
-
-SSH_FORWARDED=$(get_remote_ip -n)
+# Set the title of an xterm to the hostname unless the remote IP is matched by 
+# a regular expression in ~/.ssh/forwarded.
+SSH_FORWARDED=$(get_remote_ip)
 if [ ! -z "$SSH_FORWARDED" ]; then
-  if [ ! "$SSH_FORWARDED" = "62.189.242.202" -a ! "$SSH_FORWARDED" = "62.189.241.202" ]; then
-    SSH_FORWARDED=" (from $SSH_FORWARDED)"
-  else
+  if [ "$SSH_FORWARDED" = "localhost" ]; then
     SSH_FORWARDED=
+  elif [ -f ${PROFILE_HOME:-~}/.ssh/forwarded ]; then
+    for forwarded in $(< ${PROFILE_HOME:-~}/.ssh/forwarded); do
+      if echo "$SSH_FORWARDED" | grep "$forwarded" &>/dev/null; then
+        SSH_FORWARDED=
+      fi
+    done
+    unset forwarded
   fi
+  [ ! -z "$SSH_FORWARDED" ] && SSH_FORWARDED=" (from $(get_remote_ip -n))"
 fi
 
+# Unscientific check for grid jobs.
+case ${SSH_CLIENT##* } in
+  ""|22|2222);;
+  *) SSH_FORWARDED="$SSH_FORWARDED [grid]"
+esac
+
 info="$HOSTNAME$SSH_FORWARDED"
 
 # Check for vim.
 vimchild=" [vim]"
 if ps -o comm= -p $PPID 2>/dev/null | grep '^vim*$' &>/dev/null; then
   # Clear [vim] when exiting.
-  trap "echo -ne '\\033]0;$info\\007'" exit
+  trap "echo -ne '\\033]0;$info\\033\\0134'" exit
   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" -o "${TERM%%-bce}" = "$TERM" ]; then
+  PROMPT_COMMAND="echo -ne '\033]0;$info\033\0134\r\033[K'"
+else
+  PROMPT_COMMAND='echo -ne "\033k\033\0134"'
+fi
 unset blank info vimchild SSH_FORWARDED
+
+# Actual dtterm barfs on escape sequences.
+if [ "$TERMINAL_EMULATOR" = "dtterm" ]; then
+  unset PROMPT_COMMAND
+fi
+
+# As does screen on an ancient Solaris host.
+if [ -n "$OLDSOLARIS" -a ! "${TERM##screen}" = "$TERM" ]; then
+  unset PROMPT_COMMAND
+fi