From 4bf36130f45e5d1d810221182040c6aee48df227 Mon Sep 17 00:00:00 2001
From: James McGlashan <jamesm.sitegen@gmail.com>
Date: Fri, 2 Dec 2011 17:23:42 +1100
Subject: [PATCH 1/4]

---
 plugins/keychain/keychain.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh
index 6fdf99e88..e599b1992 100644
--- a/plugins/keychain/keychain.plugin.zsh
+++ b/plugins/keychain/keychain.plugin.zsh
@@ -28,6 +28,10 @@ function keychain() {
       echo "Stopping agent"
       ssh-agent -k >/dev/null && [[ -f $ssh_env ]] && rm $ssh_env
       ;;
+    "status")
+      [[ -f "$ssh_env" ]] && echo "$0: status is running" \
+        || echo "$0: status is stopped"
+      ;;
     *)
       echo "$0: invalid command $1" 2>&1
       ;;

From 31206870324992b0a0ba2ac8aa5dfa6ba239e378 Mon Sep 17 00:00:00 2001
From: James McGlashan <jamesm.sitegen@gmail.com>
Date: Fri, 2 Dec 2011 17:30:52 +1100
Subject: [PATCH 2/4] added in the status sub-function to the keychain function

---
 plugins/keychain/keychain.plugin.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh
index e599b1992..09e615551 100644
--- a/plugins/keychain/keychain.plugin.zsh
+++ b/plugins/keychain/keychain.plugin.zsh
@@ -1,5 +1,4 @@
-function keychain_start_agent()
-{
+function keychain_start_agent() {
   local -a identities
 
   # start ssh-agent and setup environment

From 95459c2c11fe200ed4c8273164c46b06ac4286ab Mon Sep 17 00:00:00 2001
From: James McGlashan <jamesm.sitegen@gmail.com>
Date: Sat, 3 Dec 2011 00:29:25 +1100
Subject: [PATCH 3/4]

---
 plugins/keychain/keychain.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh
index 09e615551..6c1b9344f 100644
--- a/plugins/keychain/keychain.plugin.zsh
+++ b/plugins/keychain/keychain.plugin.zsh
@@ -23,7 +23,7 @@ function keychain() {
         keychain_start_agent;
       fi
       ;;
-    "kill")
+    "stop")
       echo "Stopping agent"
       ssh-agent -k >/dev/null && [[ -f $ssh_env ]] && rm $ssh_env
       ;;

From 814d73f76f89f217a6ed13aff9f0c5f137abe4fd Mon Sep 17 00:00:00 2001
From: James McGlashan <jamesm.sitegen@gmail.com>
Date: Sat, 3 Dec 2011 00:31:28 +1100
Subject: [PATCH 4/4]

---
 plugins/keychain/keychain.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh
index 6c1b9344f..3c1186479 100644
--- a/plugins/keychain/keychain.plugin.zsh
+++ b/plugins/keychain/keychain.plugin.zsh
@@ -7,7 +7,7 @@ function keychain_start_agent() {
   source $ssh_env >/dev/null
 
   # load identies
-  zstyle -a :omz:plugins:ssh-agent identities identities
+  zstyle -a :omz:plugins:keychain identities identities
   ssh-add $HOME/.ssh/${^identities}
 }