tadgy/dotfiles
1
0
Fork 0
Code Releases Wiki Activity Actions

Refactor ssh-agent output.

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2016-10-07 19:01:04 +01:00
commit 8d4abc0d31
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.bash_profile
View file

@ -20,11 +20,9 @@ export VISUAL="$EDITOR"
# Platform specific set up. # Platform specific set up.
_PLATFORM="$(uname -s)" _PLATFORM="$(uname -s)"
if [ "$_PLATFORM" = "Linux" ]; then if [ "$_PLATFORM" = "Linux" ]; then
# Environment,
export I_WANT_A_BROKEN_PS=1 export I_WANT_A_BROKEN_PS=1
hash dircolors >/dev/null 2>&1 && eval "$(dircolors -b ~/.dir_colors)" hash dircolors >/dev/null 2>&1 && eval "$(dircolors -b ~/.dir_colors)"
elif [ "$_PLATFORM" = "Darwin" ]; then elif [ "$_PLATFORM" = "Darwin" ]; then
# Environment.
export LSCOLORS="ExGxdxdxCxDxDxbcacbeae" export LSCOLORS="ExGxdxdxCxDxDxbcacbeae"
export MANPATH="/opt/local/share/man:$MANPATH" export MANPATH="/opt/local/share/man:$MANPATH"
export PATH="/opt/local/bin:/opt/local/sbin:$PATH" export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
@ -38,35 +36,35 @@ hash ssh-add ssh-agent >/dev/null 2>&1 && {
if [ ! -z "$SSH_AUTH_SOCK" ]; then if [ ! -z "$SSH_AUTH_SOCK" ]; then
ssh-add -l >/dev/null 2>&1 ssh-add -l >/dev/null 2>&1
if (( $? < 2 )); then if (( $? < 2 )); then
echo "Connected to ssh-agent."
echo echo
echo "Connected to forwarded ssh-agent ($SSH_AGENT_PID)."
alias ssh='ssh-add -l >/dev/null 2>&1 && unalias ssh || { ssh-add && unalias ssh; }; ssh' alias ssh='ssh-add -l >/dev/null 2>&1 && unalias ssh || { ssh-add && unalias ssh; }; ssh'
else else
echo
echo "Problem connecting to forwarded ssh-agent!" echo "Problem connecting to forwarded ssh-agent!"
echo
fi fi
else else
. ~/.ssh/agent 2>/dev/null . ~/.ssh/agent 2>/dev/null
ssh-add -l >/dev/null 2>&1 ssh-add -l >/dev/null 2>&1
if (( $? < 2 )); then if (( $? < 2 )); then
echo "Connected to ssh-agent."
echo echo
echo "Connected to local ssh-agent at ($SSH_AGENT_PID)."
alias ssh='ssh-add -l >/dev/null 2>&1 && unalias ssh || { ssh-add && unalias ssh; }; ssh' alias ssh='ssh-add -l >/dev/null 2>&1 && unalias ssh || { ssh-add && unalias ssh; }; ssh'
else else
if ssh-agent -s | sed -e '/^echo/ d' >~/.ssh/agent; then if ssh-agent -s | sed -e '/^echo/ d' >~/.ssh/agent; then
. ~/.ssh/agent . ~/.ssh/agent
ssh-add -l >/dev/null 2>&1 ssh-add -l >/dev/null 2>&1
if (( $? < 2 )); then if (( $? < 2 )); then
echo "Started new ssh-agent."
echo echo
echo "Started new local ssh-agent at PID $SSH_AGENT_PID."
alias ssh='ssh-add -l >/dev/null 2>&1 && unalias ssh || { ssh-add && unalias ssh; }; ssh' alias ssh='ssh-add -l >/dev/null 2>&1 && unalias ssh || { ssh-add && unalias ssh; }; ssh'
else else
echo
echo "Problem connecting to local ssh-agent!" echo "Problem connecting to local ssh-agent!"
echo
fi fi
else else
echo
echo "Failed to start local ssh-agent!" echo "Failed to start local ssh-agent!"
echo
fi fi
fi fi
fi fi