mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-03-20 03:13:33 +01:00
Never start gpg agent with ssh-agent enabled on OSX. ssh-agent starts
automatically even if not running once an ssh session is started, and things get confused if gpg-agent has ssh-support.
This commit is contained in:
parent
75b9030f48
commit
52872bc4fb
1 changed files with 2 additions and 0 deletions
|
|
@ -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
|
||||
# ssh-agent running, start gpg-agent without ssh support
|
||||
start_agent_nossh;
|
||||
else if [][ "$OSTYPE" = "darwin"* ]; then
|
||||
start_agent_nossh
|
||||
else
|
||||
# otherwise start gpg-agent with ssh support
|
||||
start_agent_withssh;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue