X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/3b41df910f9e316e0f51d6bb10d01c0432ce0fb9..4c085f9edd6e9faec8938cc6b33f7f3175d35015:/dot/bashrc

diff --git a/dot/bashrc b/dot/bashrc
index 9e872f5..f655756 100644
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -11,6 +11,30 @@ case ${__mdw_bashrc+t} in
   *) __mdw_bashrc=t
 
 ###--------------------------------------------------------------------------
+### 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"
@@ -46,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
 
 ###--------------------------------------------------------------------------