Fix coding-style in GPG and SSH agent plugins
This commit is contained in:
parent
05e86657c3
commit
9c36a5e626
|
@ -6,22 +6,22 @@
|
|||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
local GPG_ENV="$HOME/.gnupg/gpg-agent.env"
|
||||
_gpg_env="$HOME/.gnupg/gpg-agent.env"
|
||||
|
||||
if (( ! $+commands[gpg-agent] )); then
|
||||
return
|
||||
fi
|
||||
|
||||
function _gpg-agent-start() {
|
||||
/usr/bin/env gpg-agent --daemon --enable-ssh-support --write-env-file "${GPG_ENV}" > /dev/null
|
||||
chmod 600 "${GPG_ENV}"
|
||||
source "${GPG_ENV}" > /dev/null
|
||||
gpg-agent --daemon --enable-ssh-support --write-env-file "${_gpg_env}"
|
||||
chmod 600 "${_gpg_env}"
|
||||
source "${_gpg_env}"
|
||||
}
|
||||
|
||||
# Source GPG agent settings, if applicable.
|
||||
if [[ -f "${GPG_ENV}" ]]; then
|
||||
source "${GPG_ENV}" > /dev/null
|
||||
ps -ef | grep "${SSH_AGENT_PID}" | grep gpg-agent > /dev/null || {
|
||||
if [[ -f "${_gpg_env}" ]]; then
|
||||
source "${_gpg_env}"
|
||||
ps -ef | grep "${SSH_AGENT_PID}" | grep -q 'gpg-agent' || {
|
||||
_gpg-agent-start
|
||||
}
|
||||
else
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
# zstyle ':omz:plugin:ssh-agent' identities 'id_rsa' 'id_rsa2' 'id_github'
|
||||
#
|
||||
|
||||
_ssh_agent_env="$HOME/.ssh/environment-$HOST"
|
||||
_ssh_agent_env="${HOME}/.ssh/environment-${HOST}"
|
||||
_ssh_agent_forwarding=
|
||||
|
||||
function _ssh-agent-start() {
|
||||
|
@ -30,7 +30,7 @@ function _ssh-agent-start() {
|
|||
rm -f "${_ssh_agent_env}"
|
||||
ssh-agent > "${_ssh_agent_env}"
|
||||
chmod 600 "${_ssh_agent_env}"
|
||||
source "${_ssh_agent_env}" > /dev/null
|
||||
source "${_ssh_agent_env}"
|
||||
|
||||
# Load identies.
|
||||
zstyle -a ':omz:plugin:ssh-agent' identities 'identities'
|
||||
|
@ -40,7 +40,7 @@ function _ssh-agent-start() {
|
|||
if [[ ! -n "${identities}" ]]; then
|
||||
ssh-add
|
||||
else
|
||||
ssh-add "$HOME/.ssh/${^identities}"
|
||||
ssh-add "${HOME}/.ssh/${^identities}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
@ -51,8 +51,8 @@ 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}" > /dev/null
|
||||
ps -ef | grep "${SSH_AGENT_PID}" | grep ssh-agent$ > /dev/null || {
|
||||
source "${_ssh_agent_env}"
|
||||
ps -ef | grep "${SSH_AGENT_PID}" | grep -q 'ssh-agent$' || {
|
||||
_ssh-agent-start;
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue