X-Git-Url: https://arthur.barton.de/gitweb/?p=ax-zsh.git;a=blobdiff_plain;f=ax.zsh;h=d7f80981a51e316e522365c5eb52ab7da1835232;hp=42c2792a6ae9a60a9ff606bff8bc1504a8945355;hb=0e0f4b13e6ff7ce5c785cab831e83ab380b431e7;hpb=0352db4ec2697b1f2016087b897b3447290f8ebe

diff --git a/ax.zsh b/ax.zsh
index 42c2792..d7f8098 100644
--- 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!
 			:
@@ -41,12 +42,21 @@ 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 [[ ${#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
@@ -66,7 +76,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 +99,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
@@ -150,6 +175,19 @@ else
 
 	# 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