bug 409545: profile-sshagent.sh chokes on spaces in /Users/bhearsum - quote the last , don't try to start if ~/.ssh doesn't exist. r=luser, patch=me
git-svn-id: svn://10.0.0.236/trunk@242565 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
596900935e
commit
cce43f5c8e
@ -22,17 +22,19 @@
|
||||
SSH_ENV="$HOME/.ssh/environment"
|
||||
|
||||
function start_agent {
|
||||
ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
|
||||
ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
|
||||
chmod 600 "${SSH_ENV}"
|
||||
. "${SSH_ENV}" > /dev/null
|
||||
ssh-add;
|
||||
}
|
||||
|
||||
if [ -f "${SSH_ENV}" ]; then
|
||||
. "${SSH_ENV}" > /dev/null
|
||||
ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
|
||||
if [ -d "$HOME/.ssh" ]; then
|
||||
if [ -f "${SSH_ENV}" ]; then
|
||||
. "${SSH_ENV}" > /dev/null
|
||||
ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
|
||||
start_agent;
|
||||
}
|
||||
else
|
||||
start_agent;
|
||||
}
|
||||
else
|
||||
start_agent;
|
||||
fi
|
||||
fi
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user