Include the theme into the global context

[ax-zsh.git] / ax.zsh

diff --git a/ax.zsh b/ax.zsh
index 6915c467e8803c3b3b6d25d95d44962260234870..4387f8d532416d623c154fcc53dcfe9fdeba8181 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
@@ -174,6 +177,19 @@ else
        for plugin ($plugin_list); do
                axzsh_load_plugin "$plugin" "$script_type" "$cache_file"
        done
+
+       # Read the "theme file", if any and in "zshrc" stage:
+       if [[ "$script_type" = "zshrc" ]]; then
+               if [[ -r "$AXZSH_THEME" ]]; then
+                       source "$AXZSH_THEME"
+                       if [[ -n "$cache_file" ]]; then
+                               # Include the theme into the new cache file:
+                               echo "# BEGIN Theme" >>"$cache_file"
+                               "$cat_cmd" "$AXZSH_THEME" >>"$cache_file"
+                               echo "# END Theme" >>"$cache_file"
+                       fi
+               fi
+       fi
 fi
 
 # Clean up ...