From f0413d746353cbb73e9fdbc027214986a7adc3f6 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues.hiegel@qosmos.com>
Date: Mon, 20 Feb 2012 15:20:16 +0100
Subject: [Prompts/Agents] Add specific colors for specific ssh keys

---
 11_Colors.zsh  |  3 ++-
 12_Prompts.zsh | 19 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/11_Colors.zsh b/11_Colors.zsh
index 379a708..2185826 100644
--- a/11_Colors.zsh
+++ b/11_Colors.zsh
@@ -61,8 +61,9 @@ set_prompt_colors ()
 
 	_agent_colors[empty]="$_prompt_colors[soft_generic]"
 	_agent_colors[remote_empty]="$color[bold];$color[black]"
-	_agent_colors[has_keys]="$color[bold];$color[yellow]"
+	_agent_colors[has_keys]="$_prompt_colors[bold_generic]"
 	_agent_colors[has_remote_keys]="$_prompt_colors[bold_generic]"
+	_agent_colors[id_dsa]="$color[bold];$color[yellow]"
 
 	_gcl_colors[init]="$color[black];$color[bold]"
 	_gcl_colors[gitdir]="$color[red];$color[bold]"
diff --git a/12_Prompts.zsh b/12_Prompts.zsh
index c78f97c..615b39f 100644
--- a/12_Prompts.zsh
+++ b/12_Prompts.zsh
@@ -140,30 +140,29 @@ __update_prompt_elements()
 			# That's a local agent
 			if [ "$SSH_AGENT_KEYLIST" != "" ]
 			then
-				AGENTCOLOR="has_keys"
-                A____CHAR=${AGENT_WITH_KEYS:-$( [ $_is_multibyte_compliant ] && echo "✔" || echo "$" )}
-                AGENTCHAR=""
-                for i in {1..$(echo $SSH_AGENT_KEYLIST | wc -l )}
+                AgentChar=${AGENT_WITH_KEYS:-$( [ $_is_multibyte_compliant ] && echo "✔" || echo "$" )}
+                AGENTS=""
+                for i in $(echo $SSH_AGENT_KEYLIST | cut -d' ' -f3 )
                 do
-                    AGENTCHAR=$AGENTCHAR$A____CHAR
+                    AGENTS=$AGENTS$C_${_agent_colors[$i:t]:-$_agent_colors[has_keys]}$_C$AgentChar
                 done
 			else
 				AGENTCOLOR="empty"
-				AGENTCHAR=${AGENT_EMPTY:-$( [ $_is_multibyte_compliant ] && echo "✘" || echo "S" )}
+				AgentChar=${AGENT_EMPTY:-$( [ $_is_multibyte_compliant ] && echo "✘" || echo "S" )}
+                AGENTS=$C_$_agent_colors[$AGENTCOLOR]$_C"$AgentChar"
 			fi
 		else
 			# That's a forwarded agent
 			if [ "$SSH_AGENT_KEYLIST" != "" ]
 			then
 				AGENTCOLOR="has_remote_keys"
-				AGENTCHAR=${AGENT_SOCK_WITH_KEYS:-$( [ $_is_multibyte_compliant ] && echo "✓" || echo "@" )}
+				AgentChar=${AGENT_SOCK_WITH_KEYS:-$( [ $_is_multibyte_compliant ] && echo "✓" || echo "@" )}
 			else
 				AGENTCOLOR="remote_empty"
-				AGENTCHAR=${AGENT_SOCK_EMPTY:-$( [ $_is_multibyte_compliant ] && echo "✗" || echo "O" )}
+				AgentChar=${AGENT_SOCK_EMPTY:-$( [ $_is_multibyte_compliant ] && echo "✗" || echo "O" )}
 			fi
+            AGENTS=$C_$_agent_colors[$AGENTCOLOR]$_C"$AgentChar"
 		fi
-
-		AGENTS=$C_$_agent_colors[$AGENTCOLOR]$_C"$AGENTCHAR"
 	fi
 
 	[ "$DEBUG" = "yes" ] && echo && echo -n "	......GPG"
-- 
cgit v1.2.3