dot/ipython-key-bindings.py: Don't leak names into the toplevel environment.

[profile] / dot / shell-rc

diff --git a/dot/shell-rc b/dot/shell-rc
index 582b94d..55a245f 100644 (file)
--- a/dot/shell-rc
+++ b/dot/shell-rc
@@ -61,7 +61,8 @@ __mdw_runhook () {
 ###--------------------------------------------------------------------------
 ### Prompt machinery.
 
-__mdw_set_prompt_hacks () { host=$(hostname); dir=""; }
+__mdw_host=$(hostname)
+__mdw_set_prompt_hacks () { host=$__mdw_host; dir=""; }
 
 __mdw_set_prompt_pieces () {
   local hqual
@@ -108,7 +109,7 @@ __mdw_set_prompt_pieces () {
   ## If this is an schroot environment or some other interesting augmented
   ## environment then point this out.
   hqual="$hqual${SCHROOT_CHROOT_NAME+/$SCHROOT_CHROOT_NAME}"
-  hqual="$hqual${MDW_BUILDENV+/$MDW_BUILDENV}"
+  hqual="$hqual${CROSS_BUILDENV+/$CROSS_BUILDENV}"
 
   ## Put together the main pieces.
   __mdw_prompt_left="$nl$bold$left$sec_l$u$host$hqual$sec_r$dir"
@@ -145,12 +146,19 @@ __mdw_set_prompt () {
   esac
 }
 
-__mdw_screen_precmd () { printf "\ek%s\e\\" "$__mdw_shell"; }
-__mdw_screen_preexec () { printf "\ek%s\e\\" "$1"; }
+__mdw_xterm_precmd () { printf >/dev/tty "\e]2;%s@%s:%s – %s\e\\" "$USER" "$__mdw_host" "$PWD" "$__mdw_shell"; }
+__mdw_xterm_preexec () { printf >/dev/tty "\e]2;%s@%s:%s – %s\e\\" "$USER" "$__mdw_host" "$PWD" "$1"; }
+
+__mdw_screen_precmd () { printf >/dev/tty "\ek%s\e\\" "$__mdw_shell"; }
+__mdw_screen_preexec () { printf >/dev/tty "\ek%s\e\\" "$1"; }
 
 if [ -t 0 ]; then
-  case ${STY+t},${__mdw_precmd_hook+t},${__mdw_preexec_hook+t} in
-    t,t,t)
+  case ${STY+t},${__mdw_precmd_hook+t},${__mdw_preexec_hook+t},${TERM} in
+    ,t,t,xterm*)
+      __mdw_addhook __mdw_precmd_hook __mdw_xterm_precmd
+      __mdw_addhook __mdw_preexec_hook __mdw_xterm_preexec
+      ;;
+    t,t,t,*)
       __mdw_addhook __mdw_precmd_hook __mdw_screen_precmd
       __mdw_addhook __mdw_preexec_hook __mdw_screen_preexec
       ;;