summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2010-09-30 20:54:45 -0700
committerRobby Russell <robby@planetargon.com>2010-09-30 20:54:45 -0700
commitd647a9b25c43b75eea6fee29f27affe5edc4b72e (patch)
tree890f3a3a9418b4d0f810f503868724145ecb1cfe
parent321f5ef3596b5a3a1fb6cb40c0b19f041cde7ee2 (diff)
downloadzsh-d647a9b25c43b75eea6fee29f27affe5edc4b72e.tar.gz
zsh-d647a9b25c43b75eea6fee29f27affe5edc4b72e.tar.bz2
zsh-d647a9b25c43b75eea6fee29f27affe5edc4b72e.zip
Tidying up the spacing to bring in line with coding standards
-rw-r--r--plugins/ssh-agent.plugin.zsh19
1 files changed, 9 insertions, 10 deletions
diff --git a/plugins/ssh-agent.plugin.zsh b/plugins/ssh-agent.plugin.zsh
index fa8c45ea2..ce0d645c1 100644
--- a/plugins/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent.plugin.zsh
@@ -4,21 +4,20 @@
local SSH_ENV=$HOME/.ssh/environment
function start_agent {
- /usr/bin/ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
- chmod 600 ${SSH_ENV}
- . ${SSH_ENV} > /dev/null
- /usr/bin/ssh-add;
+ /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
+ chmod 600 ${SSH_ENV}
+ . ${SSH_ENV} > /dev/null
+ /usr/bin/ssh-add;
}
# Source SSH settings, if applicable
if [ -f "${SSH_ENV}" ]; then
- . ${SSH_ENV} > /dev/null
- #ps ${SSH_AGENT_PID} doesn't work under cywgin
- ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
- start_agent;
- }
+ . ${SSH_ENV} > /dev/null
+ ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+ start_agent;
+ }
else
- start_agent;
+ start_agent;
fi