From 551a4823350285057f682ef6329d347042e1a157 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 21 Aug 2017 13:53:49 +0200 Subject: zsh: Don't init gnupg on macOS. Assume GPG Tools are installed instead --- zsh/.config/zsh/.zshrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zsh') diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index b7a20b9..91d5e01 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -106,7 +106,7 @@ bindkey '\e ' hist-complete zstyle ':completion:*' matcher-list 'm:{a-zA-Z-_}={A-Za-z_-}' 'r:|=*' 'l:|=* r:|=*' zstyle ':completion:*' completer _expand _complete _match -if [[ -n $commands[gpg-connect-agent] ]] +if [[ $os -ne "darwin" && -n $commands[gpg-connect-agent] ]] then # When using SSH support, use the current TTY for passphrase prompts gpg-connect-agent updatestartuptty /bye > /dev/null @@ -117,7 +117,7 @@ then else echo "$(gpgconf --list-dirs agent-ssh-socket) doesn't exist. Is gpg-agent running ?" fi -elif [[ -z $SSH_AUTH_SOCK && $commands[ssh-agent] ]] +elif [[ -z "$SSH_AUTH_SOCK" && -n $commands[ssh-agent] ]] then eval $(ssh-agent) fi -- cgit 1.4.1