Better sort search path, and prefere "sbin" over "bin"

[ax-zsh.git] / ax.zsh

diff --git a/ax.zsh b/ax.zsh
index eafae555501cf816ee6ef509258af8588d77a218..88c16bd79bcbf9853b3a13f2a3d3e1cbd396c7bf 100644 (file)
--- a/ax.zsh
+++ b/ax.zsh
@@ -1,86 +1,100 @@
 # AX-ZSH: Alex' Modular ZSH Configuration
-# Copyright (c) 2015 Alexander Barton <alex@barton.de>
+# Copyright (c) 2015-2016 Alexander Barton <alex@barton.de>
+
+script_name="${${(%):-%N}:t}"
+script_type="$script_name[2,-1]"
 
 # Load plugin code of a given type.
 # - $1: plugin name
 # - $2: plugin type (optional; defaults to "zshrc")
 function axzsh_load_plugin {
-       plugin="$1"
+       dname="$1:A"
+       plugin="$dname:t"
        [[ -z "$2" ]] && type="zshrc" || type="$2"
+       fname="$dname/$plugin.$type"
+
+       # Strip repository prefix (like "alexbarton#test-plugin"):
+       [[ "$plugin" =~ "#" ]] && plugin=$(echo $plugin | cut -d'#' -f2-)
 
-       for dname in \
-               "$AXZSH_PLUGIN_D/$plugin" \
-               "$AXZSH/plugins/$plugin" \
-               "$AXZSH/core/$plugin" \
-       ; do
-               [[ ! -d "$dname" ]] && continue
+       # "short plugin name": strip ".zsh" suffix:
+       plugin_short=${plugin%.zsh}
 
-               fname="$dname/$plugin.$type"
-               if [[ ! -r "$fname" && "$type" == "zshrc" ]]; then
-                       if [[ -r "$dname/$plugin.plugin.zsh" ]]; then
-                               # Oh My ZSH plugin
-                               type="plugin.zsh"
-                               fname="$dname/$plugin.plugin.zsh"
-                       elif [[ -r "$dname/init.zsh" ]]; then
-                               # Prezto module
-                               type="init.zsh"
-                               fname="$dname/init.zsh"
-                       fi
+       if [[ ! -d "$dname" ]]; then
+               # Plugin not found!
+               if [[ -n "$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
+       fi
 
-               if [[ -r "$fname" ]]; then
-                       [[ -f "$HOME/.axzsh.debug" ]] \
-                               && echo "   - $plugin ($type) ..."
-                       source "$fname"
+       if [[ ! -r "$fname" && "$type" == "zshrc" ]]; then
+               if [[ -r "$dname/$plugin.zprofile" || -r "$dname/$plugin.zlogout" ]]; then
+                       # Native AX-ZSH plugin, but for different stage. Skip it!
+                       :
+               elif [[ -r "$dname/${plugin_short}.plugin.zsh" ]]; then
+                       # Oh My ZSH plugin
+                       type="plugin.zsh"
+                       fname="$dname/${plugin_short}.plugin.zsh"
+               elif [[ -r "$dname/init.zsh" ]]; then
+                       # Prezto module
+                       type="init.zsh"
+                       fname="$dname/init.zsh"
+               else
+                       echo "AX-ZSH plugin type of \"$plugin\" unknown, skipped!" >&2
                        return 0
                fi
-               return 0
-       done
-       [[ -f "$HOME/.axzsh.debug" ]] \
-               && echo "Plugin \"$plugin\" not found (type \"$type\")!" >/dev/stderr
-       return 1
+       fi
+
+       if [[ "$type" == "zprofile" && -d "$dname/functions" ]]; then
+               # Add plugin function path when folder exists
+               [[ -n "$AXZSH_DEBUG" ]] \
+                       && echo "   - $plugin ($type): functions ..."
+               axzsh_fpath+=("$dname/functions")
+       fi
+
+       if [[ -r "$fname" ]]; then
+               # Read plugin ...
+               [[ -n "$AXZSH_DEBUG" ]] \
+                       && echo "   - $plugin ($type) ..."
+               source "$fname"
+       fi
+
+       # It is a success, even if only the plugin directory (and no script!)
+       # exists at all! Rationale: The script could be of an other type ...
+       return 0
 }
 
 # 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
+               export AXZSH_DEBUG=1
+               echo "AXZSH=$AXZSH"
+               echo "AXZSH_DEBUG=$AXZSH_DEBUG"
+               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 "~/.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
-       )
-fi
+[[ -n "$AXZSH_DEBUG" ]] && echo "» $script_name:"
 
 # Setup list of plugins to load:
 typeset -U plugin_list
 plugin_list=(
-       $AXZSH/core/[0-5]*
-       $axzsh_default_plugins
-       $axzsh_plugins
-       $plugins
-       $AXZSH/core/[6-9]*
+       "$AXZSH/core/"[0-5]*
+       "$AXZSH/active_plugins/"*(N)
+       "$AXZSH/core/"[6-9]*
 )
 
 # 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"
+       axzsh_load_plugin "$plugin" "$script_type"
 done
+
+# Clean up ...
+unfunction axzsh_load_plugin
 unset script_name script_type plugin
 unset plugin_list