Check for OpenPGP secret keys before loading monkeysphere at ssh-agent-loadkeys

diff --git a/ssh-agent-loadkeys b/ssh-agent-loadkeys
index a9d0ac281c7364dee5ce256df2c78362891cf77c..47e7b901f3921cfcdccb0e26001dbee50ae8d1b5 100755 (executable)
--- a/ssh-agent-loadkeys
+++ b/ssh-agent-loadkeys
@@ -23,7 +23,7 @@ if [ -x '/usr/bin/keychain' ]; then
 
   # Check for monkeysphere
   if [ -x '/usr/bin/monkeysphere' ]; then
-    if ! ssh-add -l &> /dev/null; then
+    if ! ssh-add -l &> /dev/null && gpg --list-secret-keys &> /dev/null; then
       monkeysphere subkey-to-ssh-agent
     fi
   fi