X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/92e4caa821f2804e7aa04ee138637bf1f230b397..d9667bfae27d67af7495d151124772136afcc293:/dot/bashrc

diff --git a/dot/bashrc b/dot/bashrc
index 5f9742a..f655756 100644
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -10,9 +10,38 @@ case ${__mdw_bashrc+t} in
   t) ;;
   *) __mdw_bashrc=t
 
-## Fetch the common configuration.
+###--------------------------------------------------------------------------
+### Hook implementation.
+
+__mdw_precmd_hook= __mdw_preexec_hook=
+__mdw_running=t
+
+__mdw_run_precmd_hook () {
+  __mdw_runhook __mdw_precmd_hook "$@"
+  __mdw_running=nil
+}
+__mdw_run_preexec_hook () {
+  case $__mdw_running in
+    t) ;;
+    nil)
+      __mdw_running=t;
+      set -- $(history 1); shift
+      __mdw_runhook __mdw_preexec_hook "$*"
+      ;;
+  esac
+}
+
+PROMPT_COMMAND=__mdw_run_precmd_hook
+trap __mdw_run_preexec_hook DEBUG
+
+###--------------------------------------------------------------------------
+### Common shell configuration.
+
 . "$HOME/.shell-rc"
 
+###--------------------------------------------------------------------------
+### Other preliminaries.
+
 ## If we've not run the main profile yet, we should do that first.  It sets
 ## up things we rely on.  Also, if there's a system script, we should run
 ## that too.
@@ -27,7 +56,7 @@ __mdw_source_if_exists /etc/bash_completion "$HOME/.bash_completion"
 
 __mdw_set_prompt_hacks () {
   case "$TERM" in
-    linux*|screen*|xterm*|vt100*|eterm*)
+    linux*|screen*|xterm*|putty*|vt100*|eterm*)
       case "$(tput bold)" in
 	"") bold="\[$(tput md)\]" unbold="\[$(tput me)\]" ;;
 	*) bold="\[$(tput bold)\]" unbold="\[$(tput sgr0)\]" ;;
@@ -41,18 +70,11 @@ __mdw_set_prompt_hacks () {
   host='\h' dir=' \w'
 }
 
-__mdw_before_cmd_hack () {
-  set -- $(history 1); shift
-  __mdw_preexec "$*"
-}
-
 ## Only bother if the shell is interactive.
 if [ -t 0 ]; then
   PROMPT_DIRTRIM=5
   __mdw_source_if_exists /usr/lib/git-core/git-sh-prompt
   __mdw_set_prompt_pieces
-  PROMPT_COMMAND=__mdw_precmd
-  PS0="\$(__mdw_before_cmd_hack)"
 fi
 
 ###--------------------------------------------------------------------------