X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ax.zsh;h=d7f80981a51e316e522365c5eb52ab7da1835232;hb=df735ed53e970919b7a9a8f6577b99a72b418291;hp=6915c467e8803c3b3b6d25d95d44962260234870;hpb=15f0cf1b5813fb6b9159d71edcfcba952d57eecb;p=ax-zsh.git

diff --git a/ax.zsh b/ax.zsh
index 6915c46..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!
 			:
@@ -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
@@ -172,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