up to 2.4.5

[packages/gnupg2.git] / gnupg-agent.sh

diff --git a/gnupg-agent.sh b/gnupg-agent.sh
index bfe7e40d2eab0127cbe0824d5a7a3eec15388340..6b2dadbf81493c6027ea59f6e6120e12afba5bea 100644 (file)
--- a/gnupg-agent.sh
+++ b/gnupg-agent.sh
@@ -1,24 +1,13 @@
 #!/bin/sh
 
 if [ -r "${HOME}/.gnupg/gpg.conf" ]; then
-    CFG="${HOME}/.gnupg/gpg.conf"
+       CFG="${HOME}/.gnupg/gpg.conf"
 else
-    CFG="${HOME}/.gnupg/options"
-fi
-
-X11=no
-if [ -r "${HOME}/.gnupg/gpg-agent.conf" ]; then
-    grep -qE "^pinentry-program.*pinentry-(qt|gtk)" "${HOME}/.gnupg/gpg-agent.conf" && X11=yes
+       CFG="${HOME}/.gnupg/options"
 fi
 
 if grep -q "^[[:blank:]]*use-agent" ${CFG} 2>/dev/null; then
-    if [ -f "${HOME}/.gnupg/GPG_AGENT_INFO" ] && pid="$(cut -d: -f2 $HOME/.gnupg/GPG_AGENT_INFO)" && [ -n "$pid" ] && kill -0 "$pid"  2>/dev/null; then
-       export GPG_AGENT_INFO="$(cat ${HOME}/.gnupg/GPG_AGENT_INFO)"
-    else
-       if [ -n "$DISPLAY" -a "$X11" = "yes" ] || [ -z "$DISPLAY" -a "$X11" = "no" ]; then
-           eval "$(gpg-agent --daemon)"
-           echo $GPG_AGENT_INFO > ~/.gnupg/GPG_AGENT_INFO
-           export GPG_AGENT_INFO
-       fi
-    fi
+       /usr/bin/gpgconf --launch gpg-agent
 fi
+
+unset CFG