aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2018-07-15 14:46:34 -0300
committerSilvio Rhatto <rhatto@riseup.net>2018-07-15 14:46:34 -0300
commit9928e78fc315713ae371d33f30f5bba5d5915024 (patch)
tree25ab51a77830fe8c71b70450460d1aa5c874b434
parent41d6b78bdb3fd998308818fce2dd017c1eb136ff (diff)
downloadutils-ssh-9928e78fc315713ae371d33f30f5bba5d5915024.tar.gz
utils-ssh-9928e78fc315713ae371d33f30f5bba5d5915024.tar.bz2
Check for OpenPGP secret keys before loading monkeysphere at ssh-agent-loadkeys
-rwxr-xr-xssh-agent-loadkeys2
1 files changed, 1 insertions, 1 deletions
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