zsh: use pinentry-curses when connected over ssh

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

diff --git a/zsh/lib/gpg.zsh b/zsh/lib/gpg.zsh
index 818e241f0955d656eecf7f2c8d1df2b0dca6dfce..fdc13db72e2db38e4a1266163622d1f42fd8163d 100644 (file)
--- a/zsh/lib/gpg.zsh
+++ b/zsh/lib/gpg.zsh
@@ -1,34 +1,9 @@
-#
-# Provides for an easier use of GPG by setting up gpg-agent.
-#
-# Authors:
-#   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="$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")"
-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)"
 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
 if [[ -n "$SSH_CONNECTION" ]]; then

-  export PINENTRY_USER_DATA='USE_CURSES=1'
+    export PINENTRY_USER_DATA="USE_CURSES=1"

 fi
 fi