From 7a745425c49a19101c30682cb46b6c72adb065b7 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Wed, 7 Mar 2012 18:05:01 -0500 Subject: [PATCH] Redirect the output of GPG and SSH agent plugins --- plugins/gpg-agent/init.zsh | 6 +++--- plugins/ssh-agent/init.zsh | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/plugins/gpg-agent/init.zsh b/plugins/gpg-agent/init.zsh index b0e7c207..619f5b23 100644 --- a/plugins/gpg-agent/init.zsh +++ b/plugins/gpg-agent/init.zsh @@ -13,14 +13,14 @@ if (( ! $+commands[gpg-agent] )); then fi function _gpg-agent-start() { - gpg-agent --daemon --enable-ssh-support --write-env-file "${_gpg_env}" + gpg-agent --daemon --enable-ssh-support --write-env-file "${_gpg_env}" > /dev/null chmod 600 "${_gpg_env}" - source "${_gpg_env}" + source "${_gpg_env}" > /dev/null } # Source GPG agent settings, if applicable. if [[ -f "${_gpg_env}" ]]; then - source "${_gpg_env}" + source "${_gpg_env}" > /dev/null ps -ef | grep "${SSH_AGENT_PID}" | grep -q 'gpg-agent' || { _gpg-agent-start } diff --git a/plugins/ssh-agent/init.zsh b/plugins/ssh-agent/init.zsh index f67aa7f1..49e2fef7 100644 --- a/plugins/ssh-agent/init.zsh +++ b/plugins/ssh-agent/init.zsh @@ -30,13 +30,11 @@ function _ssh-agent-start() { rm -f "${_ssh_agent_env}" ssh-agent > "${_ssh_agent_env}" chmod 600 "${_ssh_agent_env}" - source "${_ssh_agent_env}" + source "${_ssh_agent_env}" > /dev/null # Load identies. zstyle -a ':omz:plugin:ssh-agent' identities 'identities' - print starting ssh-agent... - if [[ ! -n "${identities}" ]]; then ssh-add else @@ -51,7 +49,7 @@ if is-true "${_ssh_agent_forwarding}" && [[ -n "$SSH_AUTH_SOCK" ]]; then [[ -L "$SSH_AUTH_SOCK" ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen elif [ -f "${_ssh_agent_env}" ]; then # Source SSH settings, if applicable. - source "${_ssh_agent_env}" + source "${_ssh_agent_env}" > /dev/null ps -ef | grep "${SSH_AGENT_PID}" | grep -q 'ssh-agent$' || { _ssh-agent-start; }