Setup $PATH on 1st run only

[ax-zsh.git] / ax.zsh

diff --git a/ax.zsh b/ax.zsh
index 59e172d46197f64a770782a08777d1dbd3e02072..de39ad8499b52bcd9527d489b20b436d0c9e33e2 100644 (file)
--- a/ax.zsh
+++ b/ax.zsh
@@ -13,6 +13,12 @@ function axzsh_load_plugin {
        [[ -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 [[ -n "$AXZSH_DEBUG" ]]; then
@@ -29,25 +35,29 @@ function axzsh_load_plugin {
                if [[ -r "$dname/$plugin.zprofile" || -r "$dname/$plugin.zlogout" ]]; then
                        # Native AX-ZSH plugin, but for different stage. Skip it!
                        :
-               elif [[ -r "$dname/$plugin.plugin.zsh" ]]; then
+               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
+               # Read plugin ...
                [[ -n "$AXZSH_DEBUG" ]] \
                        && echo "   - $plugin ($type) ..."
                source "$fname"
@@ -58,6 +68,16 @@ function axzsh_load_plugin {
        return 0
 }
 
+# Make sure that "my" (=ZSH) directory is in the search path ...
+if [[ -z "$AXZSH" ]]; then
+       _p="${0:h}"
+       [[ "$_p" != "." ]] && PATH="$PATH:${0:h}"
+       unset _p
+fi
+
+# Make sure that "SHELL" variable is set and exported
+[[ -n "$SHELL" ]] || export SHELL=$(command -v zsh)
+
 # Make sure that "AXZSH" variable is set and exported
 if [[ -z "$AXZSH" ]]; then
        export AXZSH="$HOME/.axzsh"
@@ -83,6 +103,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