Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Oh My Zsh
Commits
8eba1920
Unverified
Commit
8eba1920
authored
Apr 27, 2018
by
Marc Cornellà
Committed by
GitHub
Apr 27, 2018
Browse files
Revert to checking if `enable-ssh-support` is set
Fixes #6772
parent
9cd3701a
Changes
1
Show whitespace changes
Inline
Side-by-side
plugins/gpg-agent/gpg-agent.plugin.zsh
View file @
8eba1920
# Enable gpg-agent if it is not running-
# Enable gpg-agent if it is not running-
# --use-standard-socket will work from version 2 upwards
# --use-standard-socket will work from version 2 upwards
AGENT_SOCK
=
`
gpgconf
--list-dirs
|
grep
agent-socket |
cut
-d
:
-f
2
`
AGENT_SOCK
=
$(
gpgconf
--list-dirs
|
grep
agent-socket |
cut
-d
:
-f
2
)
if
[
!
-S
$
{
AGENT_SOCK
}
]
;
then
if
[
[
!
-S
$AGENT_SOCK
]
]
;
then
gpg-agent
--daemon
--use-standard-socket
>
/dev/null
2>&1
gpg-agent
--daemon
--use-standard-socket
&
>/dev/null
fi
fi
export
GPG_TTY
=
$
(
tty
)
export
GPG_TTY
=
$
TTY
# Set SSH to use gpg-agent if it's enabled
# Set SSH to use gpg-agent if it's enabled
if
[
-S
"
${
AGENT_SOCK
}
.ssh"
]
;
then
GNUPGCONFIG
=
"
${
GNUPGHOME
:-
"
$HOME
/.gnupg"
}
/gpg-agent.conf"
export
SSH_AUTH_SOCK
=
"
${
AGENT_SOCK
}
.ssh"
if
[[
-r
$GNUPGCONFIG
]]
&&
command grep
-q
enable-ssh-support
"
$GNUPGCONFIG
"
;
then
export
SSH_AUTH_SOCK
=
"
$AGENT_SOCK
.ssh"
unset
SSH_AGENT_PID
unset
SSH_AGENT_PID
fi
fi
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment