Enhance support for remote plugins with embedded themes

[ax-zsh.git] / ax.zsh

diff --git a/ax.zsh b/ax.zsh
index 42c2792a6ae9a60a9ff606bff8bc1504a8945355..6915c467e8803c3b3b6d25d95d44962260234870 100644 (file)
--- a/ax.zsh
+++ b/ax.zsh
@@ -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
@@ -66,7 +73,22 @@ function axzsh_load_plugin {
                # 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
@@ -74,7 +96,7 @@ function axzsh_load_plugin {
                        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