Setup keychain first and then check for monkeysphere

diff --git a/ssh-agent-loadkeys b/ssh-agent-loadkeys
index 608f73b565529da86b3f19a0b7efdd165c293b1d..e469ca057e40eeb3b47ef26e7b2f2dc030229236 100755 (executable)
--- 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