Set _PLATFORM in agent_prompt_command. Unlock agents file.
This commit is contained in:
parent
68f151bc7f
commit
4afcb51b3b
1 changed files with 2 additions and 2 deletions
4
.bashrc
4
.bashrc
|
|
@ -1,7 +1,7 @@
|
||||||
# Functions.
|
# Functions.
|
||||||
_agent_prompt_command() {
|
_agent_prompt_command() {
|
||||||
hash ssh-add >/dev/null 2>&1 && {
|
hash ssh-add >/dev/null 2>&1 && {
|
||||||
local OUTPUT SOCK
|
local OUTPUT SOCK _PLATFORM="$(uname -s)"
|
||||||
declare -g _SSH_PROMPT_ERROR_ISSUED
|
declare -g _SSH_PROMPT_ERROR_ISSUED
|
||||||
# Check the ssh agent socket is still alive.
|
# Check the ssh agent socket is still alive.
|
||||||
# Need to work around an ssh-add bug here: ssh-add doesn't always return 2 on failure
|
# Need to work around an ssh-add bug here: ssh-add doesn't always return 2 on failure
|
||||||
|
|
@ -19,6 +19,7 @@ _agent_prompt_command() {
|
||||||
echo "Connected to, but failed to register, alternate ssh-agent - you may need to re-add keys."
|
echo "Connected to, but failed to register, alternate ssh-agent - you may need to re-add keys."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
_unlock_agents_file
|
||||||
_SSH_PROMPT_ERROR_ISSUED=0
|
_SSH_PROMPT_ERROR_ISSUED=0
|
||||||
else
|
else
|
||||||
if [[ -z "$(egrep -v '^$' ~/.ssh/agents)" ]]; then
|
if [[ -z "$(egrep -v '^$' ~/.ssh/agents)" ]]; then
|
||||||
|
|
@ -38,7 +39,6 @@ _agent_prompt_command() {
|
||||||
else
|
else
|
||||||
_SSH_PROMPT_ERROR_ISSUED=0
|
_SSH_PROMPT_ERROR_ISSUED=0
|
||||||
fi
|
fi
|
||||||
# unset SOCK
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue