zsh: gpg-agent is started on demand

diff --git a/zsh/lib/gpg.zsh b/zsh/lib/gpg.zsh
index b62e40ac5f4be9121d29b03b8a649231cd4608b5..7b977d40eb8275720b5165fe146ef1bb62125c42 100644 (file)
--- a/zsh/lib/gpg.zsh
+++ b/zsh/lib/gpg.zsh
@@ -1,36 +1,6 @@
-#
-# Provides for an easier use of GPG by setting up gpg-agent.
-#
-# Authors:
-#   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 [[ ! -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")"
-else
-  # Export environment variables.
-  source "$_gpg_agent_env" 2> /dev/null
+if (( ! $+commands[gpg] )); then
+    return 1
 fi
 
 # Inform gpg-agent of the current TTY for user prompts.
 export GPG_TTY="$(tty)"
-
-# Clean up.
-unset _gpg_agent_{conf,env}
-
-# Disable GUI prompts inside SSH.
-if [[ -n "$SSH_CONNECTION" ]]; then
-  export PINENTRY_USER_DATA='USE_CURSES=1'
-fi