linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-23 02:35:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge e080999804 into 0ab0e67ecf

Browse source
This commit is contained in:
Sébastien HOUZÉ 2013-03-20 08:10:15 -07:00
commit f09d4e726b
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
plugins/gpg-agent/gpg-agent.plugin.zsh
View file

@ -3,24 +3,37 @@
local GPG_ENV=$HOME/.gnupg/gpg-agent.env local GPG_ENV=$HOME/.gnupg/gpg-agent.env
function start_agent { function start_agent {
if [ -n "${GPG_AGENT_HANDLE_SSH}" ] ; then
/usr/bin/env gpg-agent --daemon --enable-ssh-support --write-env-file ${GPG_ENV} > /dev/null /usr/bin/env gpg-agent --daemon --enable-ssh-support --write-env-file ${GPG_ENV} > /dev/null
chmod 600 ${GPG_ENV} chmod 600 ${GPG_ENV}
else
/usr/bin/env gpg-agent --daemon --write-env-file ${GPG_ENV} > /dev/null
chmod 600 ${GPG_ENV}
fi
. ${GPG_ENV} > /dev/null . ${GPG_ENV} > /dev/null
} }
# Source GPG agent settings, if applicable # Source GPG agent settings, if applicable
if [ -f "${GPG_ENV}" ]; then if [ -f "${GPG_ENV}" ]; then
. ${GPG_ENV} > /dev/null . ${GPG_ENV} > /dev/null
ps -ef | grep ${SSH_AGENT_PID} | grep gpg-agent > /dev/null || { if [ -n "${GPG_AGENT_HANDLE_SSH}" ] ; then
if [ $(ps -ef | grep ${SSH_AGENT_PID} | grep -c gpg-agent) -eq 0 ] ; then
start_agent; start_agent;
} fi
else
if [ $(ps -ef | grep gpg-agent | grep -c daemon) -eq 0 ] ; then
start_agent;
fi
fi
else else
start_agent; start_agent;
fi fi
export GPG_AGENT_INFO export GPG_AGENT_INFO
export SSH_AUTH_SOCK if [ -n "${GPG_AGENT_HANDLE_SSH}" ] ; then
export SSH_AGENT_PID export SSH_AUTH_SOCK
export SSH_AGENT_PID
fi
GPG_TTY=$(tty) GPG_TTY=$(tty)
export GPG_TTY export GPG_TTY