summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2015-06-23 16:19:24 +0200
committerAlan Pearce2015-06-23 16:19:24 +0200
commitfb9985390e05c26d9e456b75d7b9996663101a2f (patch)
tree4b4805eddc2871c118f1a9edab1e3549a0c77ce4
parenta0a5bbc8783e4895b7afc60d141ff8e2644cd612 (diff)
downloaddotfiles-fb9985390e05c26d9e456b75d7b9996663101a2f.tar.lz
dotfiles-fb9985390e05c26d9e456b75d7b9996663101a2f.tar.zst
dotfiles-fb9985390e05c26d9e456b75d7b9996663101a2f.zip
Don’t try to run gpg-agent on OSX
GPGTools handles this for us, without a warning
-rwxr-xr-xtag-zsh/config/zsh/zshenv2
1 files changed, 1 insertions, 1 deletions
diff --git a/tag-zsh/config/zsh/zshenv b/tag-zsh/config/zsh/zshenv
index 1558855..c48707a 100755
--- a/tag-zsh/config/zsh/zshenv
+++ b/tag-zsh/config/zsh/zshenv
@@ -66,7 +66,7 @@ then
 	eval "$(direnv hook zsh)"
 fi
 
-if [[ -s $commands[gpg-agent] ]]
+if [[ -s $commands[gpg-agent] && $os != "osx" ]]
 then
 	envfile="$HOME/.gnupg/gpg-agent.env"
 	if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null; then