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!
:
# Prezto module
type="init.zsh"
fname="$dname/init.zsh"
+ 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
[[ -n "$AXZSH_DEBUG" ]] \
&& echo " - $plugin ($type) ..."
- # 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 ...
+ # Note for "external" ("repo/*") plugins and unusual ("not so
+ # modern") terminals: These (modern?) plugins most probably
+ # don't expect such a terminal configuration and don't behave
+ # well (echo color sequences, for example). Therefore we DON'T
+ # load any external plugins at all in that case: this results in
+ # reduced/disabled functionality, but hopefully in readable
+ # output ...
case "$fname" in
*"/repos/"*)
- axzsh_is_dumb_terminal || source "$fname"
+ axzsh_is_modern_terminal && source "$fname"
;;
*)
source "$fname"
case "$fname" in
*"/repos/"*)
echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo ' - $plugin ($type): \"$fname\" ...'" >>$cache_file
- echo "axzsh_is_dumb_terminal || source '$fname'" >>$cache_file
+ echo "axzsh_is_modern_terminal && source '$fname'" >>$cache_file
;;
*)
echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo ' - $plugin ($type, cached) ...'" >>$cache_file
# Read in all the plugins for the current "type":
for plugin ($plugin_list); do
+ # Read the "theme file", if any and in "zshrc" stage.
+ # This must be done before 99_cleanup is run!
+ if [[ "$plugin:t" == "99_cleanup" && "$script_type" = "zshrc" ]]; then
+ if [[ -r "$AXZSH_THEME" ]]; then
+ source "$AXZSH_THEME"
+ if [[ -n "$cache_file" ]]; then
+ # Source the theme in the new cache file:
+ echo "# BEGIN Theme" >>"$cache_file"
+ echo 'source "$AXZSH_THEME"' >>"$cache_file"
+ echo "# END Theme" >>"$cache_file"
+ fi
+ fi
+ fi
axzsh_load_plugin "$plugin" "$script_type" "$cache_file"
done
fi