linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-05-22 04:51:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 295cd8207f into d6ccb41d0b

Browse source
This commit is contained in:
Tacgnol 2017-11-04 20:42:39 +00:00 • committed by GitHub
commit 85f9e785ab
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,8 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
if ssh-add -l > /dev/null 2> /dev/null; then if ssh-add -l > /dev/null 2> /dev/null; then
# ssh-agent running, start gpg-agent without ssh support # ssh-agent running, start gpg-agent without ssh support
start_agent_nossh; start_agent_nossh;
elif [[ "$OSTYPE" = "darwin"* ]]; then
start_agent_nossh
else else
# otherwise start gpg-agent with ssh support # otherwise start gpg-agent with ssh support
start_agent_withssh; start_agent_withssh;