X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/285a138691b40d6d20931676cc9f2fdb52fe6737..485d7cfcbdc6f70e6eb32b29cbd071f4c72c6bfc:/start-ssh-agent diff --git a/start-ssh-agent b/start-ssh-agent index 3515579..542abcd 100755 --- a/start-ssh-agent +++ b/start-ssh-agent @@ -36,7 +36,7 @@ case "$force,$SSH_AUTH_SOCK" in ;; *) start= - set +e; ssh-add -l >/dev/null 2>&1; rc=$?; set -e + set +e; ssh-add -l >/dev/null 2>&1; rc=$?; set -e [ $rc -ge 2 ] && start=t ;; esac @@ -45,10 +45,10 @@ esac if [ "$start" ]; then hostname=${HOST-$(hostname)} user=${USER-${LOGNAME-$(whoami)}} - dir=$TMPDIR/.ssh-agent.$hostname.$user socket=$dir/sock pid=$dir/pid + dir=$TMPDIR/.ssh-agent.$hostname.$user; socket=$dir/sock; pid=$dir/pid mkdir -p -m700 "$dir" SSH_AUTH_SOCK=$socket; export SSH_AUTH_SOCK - set +e; ssh-add -l >/dev/null 2>&1; rc=$?; set -e + set +e; ssh-add -l >/dev/null 2>&1; rc=$?; set -e if [ $rc -ge 2 ]; then if [ -f "$pid" ]; then kill $(cat "$pid") >/dev/null 2>&1 || :