|
@@ -1,14 +1,16 @@
|
|
|
-# Enable gpg-agent if it is not running
|
|
|
-GPG_AGENT_SOCKET="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
|
|
|
-if [ ! -S $GPG_AGENT_SOCKET ]; then
|
|
|
- gpg-agent --daemon >/dev/null 2>&1
|
|
|
- export GPG_TTY=$(tty)
|
|
|
+# Enable gpg-agent if it is not running-
|
|
|
+# --use-standard-socket will work from version 2 upwards
|
|
|
+
|
|
|
+AGENT_SOCK=`gpgconf --list-dirs | grep agent-socket | cut -d : -f 2`
|
|
|
+
|
|
|
+if [ ! -S ${AGENT_SOCK} ]; then
|
|
|
+ gpg-agent --daemon --use-standard-socket >/dev/null 2>&1
|
|
|
fi
|
|
|
+export GPG_TTY=$(tty)
|
|
|
|
|
|
-# Set SSH to use gpg-agent if it is configured to do so
|
|
|
-GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
|
|
|
-if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then
|
|
|
+# Set SSH to use gpg-agent if it's enabled
|
|
|
+if [ -S "${AGENT_SOCK}.ssh" ]; then
|
|
|
+ export SSH_AUTH_SOCK="${AGENT_SOCK}.ssh"
|
|
|
unset SSH_AGENT_PID
|
|
|
- export SSH_AUTH_SOCK=$GPG_AGENT_SOCKET
|
|
|
fi
|
|
|
|