X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/002334e82dd966e686dd0c6a36f7bc447ab80d86..148295024c93e47f90ac850bf068e592b16b1c7c:/zsh/lib/gpg.zsh

diff --git a/zsh/lib/gpg.zsh b/zsh/lib/gpg.zsh
index 818e241..b62e40a 100644
--- a/zsh/lib/gpg.zsh
+++ b/zsh/lib/gpg.zsh
@@ -5,15 +5,17 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# 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 (( ! $+commands[gpg-agent] )); then
+if [[ ! -r "$_gpg_agent_conf" ]]; then
+  # Clean up.
+  unset _gpg_agent_{conf,env}
   return 1
 fi
 
-# Set the default paths to gpg-agent files.
-_gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
-_gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
-
 # 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")"