From 65808aed66d7da2ad4e3aae5f33d1d59395b275e Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 25 Jul 2023 09:54:20 -0400 Subject: [PATCH] make keychain and gpgconf only run when found --- dot_config/zsh/dot_zshrc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index f0ef793..4cb08da 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -42,7 +42,6 @@ alias c='clear' alias daybreak='mosh daybreak -p 60101' alias epoch='mosh epoch -p 60104' alias grc='gridcoinresearchd' -alias keychain='keychain --dir "$XDG_RUNTIME_DIR" --absolute' alias l='exa -lh --git --all --octal-permissions' alias ls='exa' alias lsa='exa -a' @@ -50,9 +49,14 @@ alias lss='exa -a' alias xrm='sudo xbps-remove' # GPG setup (and SSH) -eval `keychain --quiet --eval --agents gpg D7F966B85D985743C76A17AC5A9572AE7B2E7E1C` -SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" -export SSH_AUTH_SOCK +if command -v keychain; then + alias keychain='keychain --dir "$XDG_RUNTIME_DIR" --absolute' + eval `keychain --quiet --eval --agents gpg D7F966B85D985743C76A17AC5A9572AE7B2E7E1C` +fi +if command -v gpgconf; then + SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" + export SSH_AUTH_SOCK +fi ### End user configuration ### hooks/includes