chiark
/
gitweb
/
~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bin/start-ssh-agent: Hoist variables for standard socket name.
[profile]
/
bin
/
start-ssh-agent
diff --git
a/bin/start-ssh-agent
b/bin/start-ssh-agent
index 30c0bc7f5a5a913167dbade4be85f58dddeed91e..6183ed5bfa6fa3ed501e95052a3e9b984a80c238 100755
(executable)
--- a/
bin/start-ssh-agent
+++ b/
bin/start-ssh-agent
@@
-29,6
+29,12
@@
case $chosen,$style in
;;
esac
;;
esac
+## Some useful variables.
+hostname=${HOST-$(hostname)}
+user=${USER-${LOGNAME-$(id -un)}}
+dir=$TMPDIR/.ssh-agent.$hostname.$user
+socket=$dir/sock; pid=$dir/pid
+
### Should I start a new agent?
case "$force,$SSH_AUTH_SOCK" in
t,* | nil,)
### Should I start a new agent?
case "$force,$SSH_AUTH_SOCK" in
t,* | nil,)
@@
-44,9
+50,6
@@
esac
### If so, do that
case $foundp in
nil)
### If so, do that
case $foundp in
nil)
- hostname=${HOST-$(hostname)}
- user=${USER-${LOGNAME-$(whoami)}}
- 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
mkdir -p -m700 "$dir"
SSH_AUTH_SOCK=$socket; export SSH_AUTH_SOCK
set +e; ssh-add -l >/dev/null 2>&1; rc=$?; set -e