Rework FPATH and completion system

[ax-zsh.git] / ax.zsh

diff --git a/ax.zsh b/ax.zsh
index 63c2b830994b0e69761486f80f6651d682bb7617..d0579602ae9b5a945e283085ee7f40a4ab746916 100644 (file)
--- a/ax.zsh
+++ b/ax.zsh
@@ -1,6 +1,11 @@
 # AX-ZSH: Alex' Modular ZSH Configuration
 # Copyright (c) 2015 Alexander Barton <alex@barton.de>
 
+script_name="$(basename -- "${(%):-%N}")"
+script_type="$script_name[2,-1]"
+
+[[ -f "$HOME/.axzsh.debug" ]] && echo "» $script_name:"
+
 # Load plugin code of a given type.
 # - $1: plugin name
 # - $2: plugin type (optional; defaults to "zshrc")
@@ -36,32 +41,39 @@ function axzsh_load_plugin {
                fi
                return 0
        done
-       [[ -f "$HOME/.axzsh.debug" ]] \
-               && echo "Plugin \"$plugin\" not found (type \"$type\")!" >/dev/stderr
+       # Plugin not found!
+       if [[ -f "$HOME/.axzsh.debug" ]]; then
+               # Show error message for all stages in "debug mode":
+               echo "AX-ZSH plugin \"$plugin\" not found (type \"$type\")!" >&2
+       elif [[ "$type" == "zshrc" ]]; then
+               # Show error message for the "zshrc" stage:
+               echo "AX-ZSH plugin \"$plugin\" not found, skipped!" >&2
+       fi
        return 1
 }
 
 # Make sure that "AXZSH" variable is set and exported
 if [[ -z "$AXZSH" ]]; then
        export AXZSH="$HOME/.axzsh"
-       [[ -f "$HOME/.axzsh.debug" ]] && echo "AXZSH=$AXZSH"
+       if [[ -f "$HOME/.axzsh.debug" ]]; then
+               echo "AXZSH=$AXZSH"
+               echo "AXZSH_PLUGIN_D=$AXZSH_PLUGIN_D"
+       fi
 fi
 
 # Setup list of default plugins if not set already. This allows users to
-# overwrite this list in their "~/.zshrnv" file, for example.
+# overwrite this list in their "~/.zshenv" file, for example.
 typeset -U axzsh_default_plugins
 if ! typeset +m axzsh_default_plugins | fgrep array >/dev/null 2>&1; then
        axzsh_default_plugins=(
                byebye
-               completion
                correction
-               git
                history
-               homebrew
                ls
                prompt
                ssh
                std_aliases
+               std_env
        )
 fi
 
@@ -76,9 +88,6 @@ plugin_list=(
 )
 
 # Read in all the plugins for the current "type":
-script_name="$(basename -- "${(%):-%N}")"
-script_type="$script_name[2,-1]"
-[[ -f "$HOME/.axzsh.debug" ]] && echo "» $script_name:"
 for plugin ($plugin_list); do
        axzsh_load_plugin "$(basename "$plugin")" "$script_type"
 done