Consolidated all function files into zshrc.sh

endorama · Aug 2, 2010 · a99dc55 · a99dc55
1 parent c32259c
commit a99dc55
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 29 deletions.
diff --git a/functions/chpwd_update_git_vars b/functions/chpwd_update_git_vars
diff --git a/functions/precmd_update_git_vars b/functions/precmd_update_git_vars
diff --git a/functions/preexec_update_git_vars b/functions/preexec_update_git_vars
diff --git a/functions/prompt_git_info b/functions/prompt_git_info
diff --git a/functions/update_current_git_vars.sh b/functions/update_current_git_vars.sh
diff --git a/zshrc.sh b/zshrc.sh
@@ -9,22 +9,49 @@ colors
 # Allow for functions in the prompt.
 setopt PROMPT_SUBST
 
-# Autoload zsh functions.
-fpath=($__GIT_PROMPT_DIR/functions $fpath)
-autoload -U $__GIT_PROMPT_DIR/functions/*(:t)
+## Enable auto-execution of functions.
+typeset -ga preexec_functions
+typeset -ga precmd_functions
+typeset -ga chpwd_functions
+
+# Append git functions needed for prompt.
+preexec_functions+='preexec_update_git_vars'
+precmd_functions+='precmd_update_git_vars'
+chpwd_functions+='chpwd_update_git_vars'
+
+## Function definitions
+function preexec_update_git_vars() {
+    case "$2" in
+        git*)
+        __EXECUTED_GIT_COMMAND=1
+        ;;
+    esac
+}
 
-function preexec() {
-    preexec_update_git_vars $@
+function precmd_update_git_vars() {
+    if [ -n "$__EXECUTED_GIT_COMMAND" ]; then
+        update_current_git_vars
+        unset __EXECUTED_GIT_COMMAND
+    fi
 }
 
-function precmd() {
-    precmd_update_git_vars $@
+function chpwd_update_git_vars() {
+    update_current_git_vars
 }
 
-function chpwd() {
-    chpwd_update_git_vars $@
+function update_current_git_vars() {
+    unset __CURRENT_GIT_STATUS
+
+    local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
+    _GIT_STATUS=`python ${gitstatus}`
+    __CURRENT_GIT_STATUS=("${(f)_GIT_STATUS}")
 }
 
+function prompt_git_info() {
+    if [ -n "$__CURRENT_GIT_STATUS" ]; then
+        echo "(%{${fg[red]}%}$__CURRENT_GIT_STATUS[1]%{${fg[default]}%}$__CURRENT_GIT_STATUS[2]%{${fg[magenta]}%}$__CURRENT_GIT_STATUS[3]%{${fg[default]}%})"
+    fi
+}
 
 # Set the prompt.
 PROMPT='%B%m%~%b$(prompt_git_info) %# '