diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2020-05-29 11:01:03 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-05-29 11:01:03 -0600 |
| commit | a3be2e4084285d7625e63bfe4b951c58143e3c9c (patch) | |
| tree | a018be4daef44a51b91477f38da514867659c7d6 /plugins/keychain | |
| parent | 191e14cc7f63c4525a0f66d571416faf9e91a185 (diff) | |
| parent | 93cc3964e2d265ab0571298d69d2eed0a65d13f2 (diff) | |
| download | zsh-a3be2e4084285d7625e63bfe4b951c58143e3c9c.tar.gz zsh-a3be2e4084285d7625e63bfe4b951c58143e3c9c.tar.bz2 zsh-a3be2e4084285d7625e63bfe4b951c58143e3c9c.zip | |
Merge branch 'master' of https://github.com/ohmyzsh/ohmyzsh
Diffstat (limited to 'plugins/keychain')
| -rw-r--r-- | plugins/keychain/keychain.plugin.zsh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh index 1babf5a30..f122f7982 100644 --- a/plugins/keychain/keychain.plugin.zsh +++ b/plugins/keychain/keychain.plugin.zsh @@ -1,7 +1,9 @@ +(( $+commands[keychain] )) || return + # Define SHORT_HOST if not defined (%m = host name up to first .) SHORT_HOST=${SHORT_HOST:-${(%):-%m}} -function _start_agent() { +function { local agents local -a identities local -a options @@ -28,8 +30,3 @@ function _start_agent() { [ -f "$_keychain_env_sh" ] && . "$_keychain_env_sh" [ -f "$_keychain_env_sh_gpg" ] && . "$_keychain_env_sh_gpg" } - -_start_agent - -# tidy up after ourselves -unfunction _start_agent |