Enhance support for remote plugins with embedded themes

[ax-zsh.git] / ax.zsh

diff --git a/ax.zsh b/ax.zsh
index e0812a7719f40baafa3b2536125c0544b4bf2dbd..6915c467e8803c3b3b6d25d95d44962260234870 100644 (file)
--- a/ax.zsh
+++ b/ax.zsh
@@ -9,11 +9,11 @@ script_type="$script_name[2,-1]"
 # - $2: plugin type (optional; defaults to "zshrc")
 # - $3: cache file (optional)
 function axzsh_load_plugin {
-       dname="$1:A"
-       plugin="$dname:t"
-       [[ -z "$2" ]] && type="zshrc" || type="$2"
-       fname="$dname/$plugin.$type"
-       cache_file="$3"
+       local dname="$1:A"
+       local plugin="$dname:t"
+       [[ -z "$2" ]] && local type="zshrc" || local type="$2"
+       local fname="$dname/$plugin.$type"
+       local cache_file="$3"
 
        # Strip repository prefix (like "alexbarton#test-plugin"):
        [[ "$plugin" =~ "#" ]] && plugin=$(echo $plugin | cut -d'#' -f2-)
@@ -41,10 +41,17 @@ function axzsh_load_plugin {
                        # Oh My ZSH plugin
                        type="plugin.zsh"
                        fname="$dname/${plugin_short}.plugin.zsh"
+               elif [[ -r "$dname/${plugin_short##zsh-}.plugin.zsh" ]]; then
+                       # Oh My ZSH plugin with "zsh-" prefix stripped
+                       type="plugin.zsh"
+                       fname="$dname/${plugin_short##zsh-}.plugin.zsh"
                elif [[ -r "$dname/init.zsh" ]]; then
                        # Prezto module
                        type="init.zsh"
                        fname="$dname/init.zsh"
+               elif [[ -r "$dname/$plugin.zsh-theme" ]]; then
+                       # ZSH "theme plugin", ignore here!
+                       :
                else
                        echo "AX-ZSH plugin type of \"$plugin\" unknown, skipped!" >&2
                        return 0
@@ -56,27 +63,46 @@ function axzsh_load_plugin {
                [[ -n "$AXZSH_DEBUG" ]] \
                        && echo "   - $plugin ($type): functions ..."
                axzsh_fpath+=("$dname/functions")
+
+               # Add function path to cache file.
+               [[ -n "$cache_file" ]] \
+                       && echo "axzsh_fpath+=('$dname/functions')" >>$cache_file
        fi
 
        if [[ -r "$fname" ]]; then
                # Read plugin ...
                [[ -n "$AXZSH_DEBUG" ]] \
                        && echo "   - $plugin ($type) ..."
-               source "$fname"
+
+               # Note for "external" ("repo/*") plugins and "dumb" terminals:
+               # These (modern?) plugins most probably don't expect such an
+               # unusual old terminal configuration and don't behave well
+               # (echo color sequences, for example). Therefore we DON'T load
+               # any external plugins at all when running on such a terminal:
+               # this results in reduced/disabled functionality, but hopefully
+               # in readable output ...
+
+               case "$fname" in
+                       *"/repos/"*)
+                               axzsh_is_dumb_terminal || source "$fname"
+                               ;;
+                       *)
+                               source "$fname"
+               esac
 
                if [[ -n "$cache_file" ]]; then
                        # Add plugin data to cache
-                       printf "# BEGIN: %s\ninit()\n{\n" "$fname" >>"$cache_file"
+                       printf "# BEGIN: %s\nax_plugin_init()\n{\n" "$fname" >>"$cache_file"
                        case "$fname" in
                                *"/repos/"*)
                                        echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type): \"$fname\" ...'" >>$cache_file
-                                       echo "source '$fname'" >>$cache_file
+                                       echo "axzsh_is_dumb_terminal || source '$fname'" >>$cache_file
                                        ;;
                                *)
                                        echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type, cached) ...'" >>$cache_file
                                        "$cat_cmd" "$fname" >>"$cache_file"
                        esac
-                       printf "}\ninit\n# END: %s\n\n" "$fname" >>"$cache_file"
+                       printf "}\nax_plugin_init\n# END: %s\n\n" "$fname" >>"$cache_file"
                fi
        fi
 
@@ -116,9 +142,17 @@ cat_cmd=${commands[cat]:-cat}
 
 if [[ -r "$cache_file" ]]; then
        # Cache file exists, use it!
+       # But when in the "zshrc" stage, make sure that the "zprofile" stage
+       # has already been handled (this uses the "01_zprofile" plugin which
+       # is used in the "zshrc.cache" as well, but can't be used successfully
+       # there because it becomes sourced inside of a ZSH function; so we have
+       # to source it here in the global context manually ...):
+       [[ -z "$AXZSH_ZPROFILE_READ" && "$script_type" = "zshrc" ]] \
+               && source "$AXZSH/core/01_zprofile/01_zprofile.zshrc"
        [[ -n "$AXZSH_DEBUG" ]] \
                && echo "   - Reading cache file \"$cache_file\" ..."
        source "$cache_file"
+       unfunction ax_plugin_init
 else
        # No cache file available.
        # Setup list of plugins to load: