From 5bb3af14ed43c39673f3ae8a0869931b30774f7b Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Mon, 23 Apr 2012 18:07:30 -0700
Subject: [PATCH] more resilient keychain initialization

---
 zsh/zshrc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/zsh/zshrc b/zsh/zshrc
index 5e27173..9ef13e5 100755
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -377,12 +377,12 @@ compinit
 
 # 10. SSH Keychain
 # ================
-if command_exists keychain; then
-    keychain --nogui ~/.ssh/id_rsa*~*.pub
-    KEYCHAINFILE="$HOME/.keychain/$(hostname)-sh"
-    if [[ -f $KEYCHAINFILE ]]; then
-        source $KEYCHAINFILE >/dev/null
-    fi
+if command_exists keychain && [[ -d ~/.ssh ]]; then
+  keychain --nogui ~/.ssh/id_rsa*~*.pub(N)
+  KEYCHAINFILE="$HOME/.keychain/$(hostname)-sh"
+  if [[ -f $KEYCHAINFILE ]]; then
+    source $KEYCHAINFILE >/dev/null
+  fi
 fi