Merge pull request #348 from github/lildude/workaround-bug-from-tmp

Switch to TMPDIR when working around OpenSSH bug

Author: lildude

share/github-backup-utils/ghe-ssh

@@ -61,7 +61,9 @@ if [ -z "$GHE_DISABLE_SSH_MUX" ]; then
   controlpath="$TMPDIR/.ghe-sshmux-$(echo -n "$user@$host:$port" | git hash-object --stdin | cut -c 1-8)"
   opts="-o ControlMaster=auto -o ControlPath=\"$controlpath\" -o ControlPersist=10m -o ServerAliveInterval=10 $opts"
   # Workaround for https://bugzilla.mindrot.org/show_bug.cgi?id=1988
-  [ -S $controlpath ] || ssh -f -p $port $opts -o BatchMode=yes "$host" -- /bin/true 1>/dev/null 2>&1 || true
+  if ! [ -S $controlpath ]; then
+    ( cd "$TMPDIR" && ssh -f -p $port $opts -o BatchMode=yes "$host" -- /bin/true 1>/dev/null 2>&1 || true )
+  fi
 fi
 
 # Turn on verbose SSH logging if needed