dwb: update github css

[dotfiles.git] / zsh / lib / gpg.zsh

diff --git a/zsh/lib/gpg.zsh b/zsh/lib/gpg.zsh
index 818e241f0955d656eecf7f2c8d1df2b0dca6dfce..b62e40ac5f4be9121d29b03b8a649231cd4608b5 100644 (file)
--- a/zsh/lib/gpg.zsh
+++ b/zsh/lib/gpg.zsh
@@ -5,15 +5,17 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
 #   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.
 # 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
 
   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")"
 # 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")"