From 3c96156d9aa22a02b2771402b9b90c871bf675fc Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 27 Oct 2017 10:03:48 -0200
Subject: Setup keychain first and then check for monkeysphere

---
 ssh-agent-loadkeys | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/ssh-agent-loadkeys b/ssh-agent-loadkeys
index 608f73b..e469ca0 100755
--- a/ssh-agent-loadkeys
+++ b/ssh-agent-loadkeys
@@ -4,28 +4,37 @@
 # Uses monkeysphere and keychain
 #
 
-if [ -x '/usr/bin/monkeysphere' ]; then
-  if ! ssh-add -l &> /dev/null; then
-    monkeysphere subkey-to-ssh-agent
-  fi
-fi
-
+# Check for keychain
 if [ -x '/usr/bin/keychain' ]; then
   mkdir -p $HOME/.keychain
 
-  if [ -e "$HOME/.ssh/id_rsa" ]; then
-    /usr/bin/keychain -q $HOME/.ssh/id_rsa
+  # Setup keychain
+  /usr/bin/keychain -q --noask
+
+  # Load ssh-agent info
+  if [ -e "$HOME/.keychain/$HOSTNAME-sh" ]; then
+    . $HOME/.keychain/$HOSTNAME-sh
   fi
 
-  if [ -e "$HOME/.ssh/id_ed25519" ]; then
-    /usr/bin/keychain -q $HOME/.ssh/id_ed25519
+  # Load gpg-agent info
+  #if [ -e "$HOME/.keychain/$HOSTNAME-sh-gpg" ]; then
+  #  . $HOME/.keychain/$HOSTNAME-sh-gpg
+  #fi
+
+  # Check for monkeysphere
+  if [ -x '/usr/bin/monkeysphere' ]; then
+    if ! ssh-add -l &> /dev/null; then
+      monkeysphere subkey-to-ssh-agent
+    fi
   fi
 
-  if [ -e "$HOME/.keychain/$HOSTNAME-sh" ]; then
-    . $HOME/.keychain/$HOSTNAME-sh
+  # Check for RSA key
+  if [ -e "$HOME/.ssh/id_rsa" ]; then
+    /usr/bin/keychain -q $HOME/.ssh/id_rsa
   fi
 
-  if [ -e "$HOME/.keychain/$HOSTNAME-sh-gpg" ]; then
-    . $HOME/.keychain/$HOSTNAME-sh-gpg
+  # Check for ED25519 key
+  if [ -e "$HOME/.ssh/id_ed25519" ]; then
+    /usr/bin/keychain -q $HOME/.ssh/id_ed25519
   fi
 fi
-- 
cgit v1.2.3