X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=ax.zsh;h=1936327986e8e241bea0880b6e06ab20447c4c9a;hb=1b2523083ee476870ddb30eaa95a0cf1d8dd816f;hp=e0812a7719f40baafa3b2536125c0544b4bf2dbd;hpb=cd526ff818ed5b0a94f1599b8aaed9620f0cb1f8;p=ax-zsh.git

diff --git a/ax.zsh b/ax.zsh
index e0812a7..1936327 100644
--- a/ax.zsh
+++ b/ax.zsh
@@ -9,11 +9,11 @@ script_type="$script_name[2,-1]"
 # - $2: plugin type (optional; defaults to "zshrc")
 # - $3: cache file (optional)
 function axzsh_load_plugin {
-	dname="$1:A"
-	plugin="$dname:t"
-	[[ -z "$2" ]] && type="zshrc" || type="$2"
-	fname="$dname/$plugin.$type"
-	cache_file="$3"
+	local dname="$1:A"
+	local plugin="$dname:t"
+	[[ -z "$2" ]] && local type="zshrc" || local type="$2"
+	local fname="$dname/$plugin.$type"
+	local cache_file="$3"
 
 	# Strip repository prefix (like "alexbarton#test-plugin"):
 	[[ "$plugin" =~ "#" ]] && plugin=$(echo $plugin | cut -d'#' -f2-)
@@ -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
@@ -56,27 +66,46 @@ function axzsh_load_plugin {
 		[[ -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 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_modern_terminal && source "$fname"
+				;;
+			*)
+				source "$fname"
+		esac
 
 		if [[ -n "$cache_file" ]]; then
 			# Add plugin data to cache
-			printf "# BEGIN: %s\ninit()\n{\n" "$fname" >>"$cache_file"
+			printf "# BEGIN: %s\nax_plugin_init()\n{\n" "$fname" >>"$cache_file"
 			case "$fname" in
 				*"/repos/"*)
 					echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type): \"$fname\" ...'" >>$cache_file
-					echo "source '$fname'" >>$cache_file
+					echo "axzsh_is_modern_terminal && source '$fname'" >>$cache_file
 					;;
 				*)
 					echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type, cached) ...'" >>$cache_file
 					"$cat_cmd" "$fname" >>"$cache_file"
 			esac
-			printf "}\ninit\n# END: %s\n\n" "$fname" >>"$cache_file"
+			printf "}\nax_plugin_init\n# END: %s\n\n" "$fname" >>"$cache_file"
 		fi
 	fi
 
@@ -116,9 +145,17 @@ cat_cmd=${commands[cat]:-cat}
 
 if [[ -r "$cache_file" ]]; then
 	# Cache file exists, use it!
+	# But when in the "zshrc" stage, make sure that the "zprofile" stage
+	# has already been handled (this uses the "01_zprofile" plugin which
+	# is used in the "zshrc.cache" as well, but can't be used successfully
+	# there because it becomes sourced inside of a ZSH function; so we have
+	# to source it here in the global context manually ...):
+	[[ -z "$AXZSH_ZPROFILE_READ" && "$script_type" = "zshrc" ]] \
+		&& source "$AXZSH/core/01_zprofile/01_zprofile.zshrc"
 	[[ -n "$AXZSH_DEBUG" ]] \
 		&& echo "   - Reading cache file \"$cache_file\" ..."
 	source "$cache_file"
+	unfunction ax_plugin_init
 else
 	# No cache file available.
 	# Setup list of plugins to load:
@@ -138,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