Sync minimal branch with master.
This commit is contained in:
parent
3052bbda36
commit
e4b311a6c8
6 changed files with 35 additions and 8 deletions
|
|
@ -16,7 +16,7 @@ fi
|
|||
hash ssh-add ssh-agent >/dev/null 2>&1 && {
|
||||
# Stop any started ssh-agent as long as the shell level is 1 and we're not on a tty.
|
||||
(( SHLVL == 1 )) && [[ "$(tty)" != /dev/tty* ]] && [[ -n "$SSH_AGENT_PID" ]] && {
|
||||
eval "$(ssh-agent -k >/dev/null 2>&1)" >/dev/null || printf "\\033[1;31;40m%s\\033[0;39m\\n" "Failed to stop ssh-agent." >&2
|
||||
eval "$(ssh-agent -k >/dev/null 2>&1)" >/dev/null || printf "\\033[1;31;40m%s\\033[0m\\n" "Failed to stop ssh-agent." >&2
|
||||
}
|
||||
|
||||
# Update the ~/.ssh/agents file.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue