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

[ax-zsh.git] / ax.zsh

diff --git a/ax.zsh b/ax.zsh
index 0e571b9396367f51b042e9b6982f41f9653022dc..88c16bd79bcbf9853b3a13f2a3d3e1cbd396c7bf 100644 (file)
--- a/ax.zsh
+++ b/ax.zsh
@@ -1,23 +1,27 @@
 # 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="$(basename -- "${(%):-%N}")"
+script_name="${${(%):-%N}:t}"
 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")
 function axzsh_load_plugin {
-       dname="$(readlink "$1")" || dname="$1"
-       plugin="$(basename "$dname")"
+       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-)
+
+       # "short plugin name": strip ".zsh" suffix:
+       plugin_short=${plugin%.zsh}
+
        if [[ ! -d "$dname" ]]; then
                # Plugin not found!
-               if [[ -f "$HOME/.axzsh.debug" ]]; then
+               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
@@ -28,19 +32,33 @@ function axzsh_load_plugin {
        fi
 
        if [[ ! -r "$fname" && "$type" == "zshrc" ]]; then
-               if [[ -r "$dname/$plugin.plugin.zsh" ]]; 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.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
        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
-               [[ -f "$HOME/.axzsh.debug" ]] \
+               # Read plugin ...
+               [[ -n "$AXZSH_DEBUG" ]] \
                        && echo "   - $plugin ($type) ..."
                source "$fname"
        fi
@@ -54,11 +72,15 @@ function axzsh_load_plugin {
 if [[ -z "$AXZSH" ]]; then
        export AXZSH="$HOME/.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
 
+[[ -n "$AXZSH_DEBUG" ]] && echo "» $script_name:"
+
 # Setup list of plugins to load:
 typeset -U plugin_list
 plugin_list=(
@@ -71,6 +93,8 @@ plugin_list=(
 for plugin ($plugin_list); do
        axzsh_load_plugin "$plugin" "$script_type"
 done
+
+# Clean up ...
 unfunction axzsh_load_plugin
 unset script_name script_type plugin
 unset plugin_list