Merge branch 'crash' into master

Heh I don't have a half bad memory!

config/shell/shenv

@@ -106,10 +106,14 @@ prependpath "$HOME/.config/scripts"
     prependpath "$HOME/.termux/bin"
 )
 
+# For superseding commands with better ones if they are present
 
-if grep -q enable-ssh-support "$GNUPGHOME/gpg-agent.conf" 2> /dev/null
+# SSH Agent
+
+# If GPG agent is configured for SSH
+if grep -q ^enable-ssh-support$ $GNUPGHOME/gpg-agent.conf 2> /dev/null
 then
-    # Use GPG as SSH agent
+    # Load GPG agent
     unset SSH_AGENT_PID
     if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
       export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"