## Some useful variables.
hostname=${HOST-$(hostname)}
-user=${USER-${LOGNAME-$(id -un)}}
+user=${USER-${LOGNAME-$(id -un)}} uid=${UID-$(id -u)}
dir=$TMPDIR/.ssh-agent.$hostname.$user
socket=$dir/sock; pid=$dir/pid
export SSH_AUTH_SOCK
-### Should I start a new agent?
-case "$force,$SSH_AUTH_SOCK" in
- t,* | nil,)
- foundp=nil
- ;;
- *)
- foundp=t
- set +e; ssh-add -l >/dev/null 2>&1; rc=$?; set -e
- [ $rc -ge 2 ] && foundp=nil
+## Should I start a new agent?
+foundp=nil
+case $force in
+ nil)
+ case ${SSH_AUTH_SOCK+t} in
+ t)
+ set +e; ssh-add -l >/dev/null 2>&1; rc=$?; set -e
+ if [ $rc -lt 2 ]; then foundp=t; fi
+ ;;
+ esac
+ case $foundp in
+ t) ;;
+ *)
+ for i in \
+ "$HOME/.cache/keyring-"*"/ssh" \
+ "/run/user/$uid/keyring/ssh" \
+ "$socket"
+ do
+ SSH_AUTH_SOCK=$i
+ set +e; ssh-add -l >/dev/null 2>&1; rc=$?; set -e
+ if [ $rc -lt 2 ]; then foundp=t; break; fi
+ done
+ ;;
+ esac
;;
esac