1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-25 15:20:08 +00:00
Commit graph

11 commits

Author SHA1 Message Date
Marc Cornellà
8eba19208d
Revert to checking if enable-ssh-support is set
Fixes #6772
2018-04-27 17:56:21 +02:00
Chris Fleming
9a71864288 Fix gpg-agent plugin checks (#6469)
* Always try and start gpg-agent, with --use-standard-socket it will try and use a standard socket directory. It won't start multiple agents if agent is already running. In addition, XDG_RUNTIME_DIR isn't always set

* ssh socket if broken if --daemon is run again, so onky start if we don't have a socket

* Removed unnecessary allocation of GPG_SSH_AUTH_SOCK
2018-04-21 22:26:36 +02:00
Paweł Czochański
2c87f85ad5 Fix wrong $GNUPGHOME usage in gpg-agent plugin (#6403)
$GNUPGHOME variable was used incorrectly and caused a grep error when
set.
2017-11-08 14:02:38 -08:00
Paweł Czochański
c2fb24a792 Fixed the gpg-agent plugin for new gpg versions (#6140)
The gpg-agent plugin did not work for gpg versions above or equal to
2.1 because of the `--write-env-file` option deprecation. This new version
works fine and also enables the ssh-agent support only if it is enabled in the
gpg-agent config file.
2017-11-07 08:04:38 -08:00
Sukant Hajra
cf8d76094c PLUGIN: gpg-agent: export SSH_* environment variables too
If using the gpg-agent with --enable-ssh-support, the SSH_AUTH_SOCK and
SSH_AGENT_PID environment variables need to be exported once sourced
from GPG_ENV.  Otherwise, we get no benefit from the persisting these
values to GPG_ENV; subsequent openned terminals don't see the existent
gpg-agent as a process for an SSH daemon.
2013-07-15 08:51:08 -05:00
Sukant Hajra
3d204883a6 fix gpg-agent "running already" check
The GPG_ENV file is sourced before doing the gpg-connect-agent check,
but this file (unlike the SSH_ENV file) doesn't export GPG_AGENT_INFO,
so the check always fails.  This results in new gpg-agents continuously
being spawned.

All this commit does is put in the single export to fix the problem.
2013-07-11 01:36:50 -05:00
Olaf Conradi
64fc125eba Typo 2013-06-23 12:25:35 +02:00
Olaf Conradi
711e96b1a2 Prevent starting multiple gpg-agents
Don't just overwrite the environment. First check for a running agent (an
x-session might have one running). If no agent is found, source the
environment and check again using those settings. If again no agent is
found, start a new instance.
2013-06-23 11:34:03 +02:00
Heiko Reese
174e09ca8d Added --quiet to suppress message about gpg-agent already running. 2013-02-21 03:40:32 +01:00
Heiko Reese
014ed1f0e5 Disable ssh-agent support if another ssh-agent is already running. 2013-02-21 02:46:20 +01:00
Florian Walch
60b560fc9a Added gpg-agent plugin
Based on ssh-agent plugin.
2010-10-15 16:50:39 +02:00