From b46a2fb26726c44a66f195846a7e2e73d40012f4 Mon Sep 17 00:00:00 2001
Message-Id: <b46a2fb26726c44a66f195846a7e2e73d40012f4.1714715315.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sat, 5 Nov 2016 21:28:22 +0000
Subject: [PATCH] bin/start-ssh-agent: Hoist variables for standard socket
 name.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

---
 bin/start-ssh-agent | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/start-ssh-agent b/bin/start-ssh-agent
index 30c0bc7..6183ed5 100755
--- a/bin/start-ssh-agent
+++ b/bin/start-ssh-agent
@@ -29,6 +29,12 @@ case $chosen,$style in
     ;;
 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,)
@@ -44,9 +50,6 @@ esac
 ### 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
-- 
[mdw]