chiark / gitweb /
bin/start-ssh-agent: Export `SSH_AUTH_SOCK' in just one place.
authorMark Wooding <mdw@distorted.org.uk>
Sat, 5 Nov 2016 21:28:22 +0000 (21:28 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 30 Nov 2016 12:52:43 +0000 (12:52 +0000)
bin/start-ssh-agent

index 6183ed5bfa6fa3ed501e95052a3e9b984a80c238..afcfc72937c11556e10273726087ee965e88be40 100755 (executable)
@@ -34,6 +34,7 @@ hostname=${HOST-$(hostname)}
 user=${USER-${LOGNAME-$(id -un)}}
 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
@@ -51,7 +52,7 @@ esac
 case $foundp in
   nil)
     mkdir -p -m700 "$dir"
-    SSH_AUTH_SOCK=$socket; export SSH_AUTH_SOCK
+    SSH_AUTH_SOCK=$socket
     set +e; ssh-add -l >/dev/null 2>&1; rc=$?; set -e
     if [ $rc -ge 2 ]; then
       if [ -f "$pid" ]; then
@@ -60,7 +61,7 @@ case $foundp in
       rm -f "$socket" "$pid"
       (cd /; exec ssh-agent -d -a "$socket" >/dev/null 2>&1)&
       echo $! >"$pid"
-      SSH_AUTH_SOCK=$socket; export SSH_AUTH_SOCK
+      SSH_AUTH_SOCK=$socket
     fi
     ;;
 esac