From: Samir Benmendil <me@rmz.io>
Date: Thu, 19 Feb 2015 01:49:18 +0000 (+0000)
Subject: zsh: only start gpg-agent if config file exists
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/9088d06cb7aba2bbc633e8bddc44dd193912d733?ds=inline

zsh: only start gpg-agent if config file exists
---

diff --git a/zsh/lib/gpg.zsh b/zsh/lib/gpg.zsh
index aea97b3..b62e40a 100644
--- a/zsh/lib/gpg.zsh
+++ b/zsh/lib/gpg.zsh
@@ -5,15 +5,17 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-# Return if requirements are not found.
-if (( ! $+commands[gpg-agent] )); then
-  return 1
-fi
-
 # Set the default paths to gpg-agent files.
 _gpg_agent_conf="$XDG_CONFIG_HOME/gnupg/gpg-agent.conf"
 _gpg_agent_env="$XDG_CACHE_HOME/gpg-agent-info"
 
+# Return if requirements are not found.
+if [[ ! -r "$_gpg_agent_conf" ]]; then
+  # Clean up.
+  unset _gpg_agent_{conf,env}
+  return 1
+fi
+
 # Start gpg-agent if not started.
 if ! ps -U "$USER" -o ucomm | grep -q gpg-agent; then
   eval "$(gpg-agent --daemon --write-env-file "$_gpg_agent_env")"