From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 15 Jul 2018 17:46:34 +0000 (-0300)
Subject: Check for OpenPGP secret keys before loading monkeysphere at ssh-agent-loadkeys
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=9928e78fc315713ae371d33f30f5bba5d5915024;p=utils-ssh.git

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

diff --git a/ssh-agent-loadkeys b/ssh-agent-loadkeys
index a9d0ac2..47e7b90 100755
--- 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