]> arthur.barton.de Git - ax-zsh.git/commitdiff
ax.zsh: Correctly ignore OhMyZSH "theme plugins"
authorAlexander Barton <alex@barton.de>
Sun, 3 Feb 2019 15:35:45 +0000 (16:35 +0100)
committerAlexander Barton <alex@barton.de>
Sun, 3 Feb 2019 15:35:45 +0000 (16:35 +0100)
ax.zsh

diff --git a/ax.zsh b/ax.zsh
index 6915c467e8803c3b3b6d25d95d44962260234870..fbacf6cb2ad1a5e1c1910bc31e9c3974165a2b63 100644 (file)
--- a/ax.zsh
+++ b/ax.zsh
@@ -34,6 +34,7 @@ function axzsh_load_plugin {
        fi
 
        if [[ ! -r "$fname" && "$type" == "zshrc" ]]; then
+               zsh_themes=("$dname/"*.zsh-theme(NY1))
                if [[ -r "$dname/$plugin.zprofile" || -r "$dname/$plugin.zlogout" ]]; then
                        # Native AX-ZSH plugin, but for different stage. Skip it!
                        :
@@ -49,11 +50,13 @@ function axzsh_load_plugin {
                        # Prezto module
                        type="init.zsh"
                        fname="$dname/init.zsh"
-               elif [[ -r "$dname/$plugin.zsh-theme" ]]; then
+               elif [[ ${#zsh_themes} -gt 0 ]]; then
                        # ZSH "theme plugin", ignore here!
                        :
                else
                        echo "AX-ZSH plugin type of \"$plugin\" unknown, skipped!" >&2
+                       echo "Contents of \"$dname\":" >&2
+                       ls -lh "$dname/" >&2
                        return 0
                fi
        fi