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!
:
# 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 [[ ${#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): 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
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
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 ...