From 82485764d3001c5759bb2e56a4e2779633dcc644 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 29 Aug 2017 14:33:44 +0200 Subject: zsh: Don't configure GPG SSH agent on osx --- zsh/.config/zsh/.zshenv | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv index 797dc62b..dc84f1d9 100644 --- a/zsh/.config/zsh/.zshenv +++ b/zsh/.config/zsh/.zshenv @@ -10,12 +10,6 @@ then . $ZDOTDIR/zshenv.private fi - unset SSH_AGENT_PID - if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]] - then - export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" - fi - if [[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]] then . $HOME/.nix-profile/etc/profile.d/nix.sh; @@ -47,6 +41,15 @@ then fi fi + if [[ $os != "darwin" ]] + then + unset SSH_AGENT_PID + if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]] + then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" + fi + fi + case $MACHTYPE in *64) arch=amd64 -- cgit 1.4.1