Merge branch 'master' of github.com:jamesm-sitegen/oh-my-zsh

This commit is contained in:
Simon Gomizelj 2011-12-02 08:34:31 -05:00
commit 8e724fabbb

View file

@ -1,5 +1,4 @@
function keychain_start_agent() function keychain_start_agent() {
{
local -a identities local -a identities
# start ssh-agent and setup environment # start ssh-agent and setup environment
@ -24,10 +23,14 @@ function keychain() {
keychain_start_agent; keychain_start_agent;
fi fi
;; ;;
"kill") "stop")
echo "Stopping agent" echo "Stopping agent"
ssh-agent -k >/dev/null && [[ -f $ssh_env ]] && rm $ssh_env ssh-agent -k >/dev/null && [[ -f $ssh_env ]] && rm $ssh_env
;; ;;
"status")
[[ -f "$ssh_env" ]] && echo "$0: status is running" \
|| echo "$0: status is stopped"
;;
*) *)
echo "$0: invalid command $1" 2>&1 echo "$0: invalid command $1" 2>&1
;; ;;