9a71864288
* Always try and start gpg-agent, with --use-standard-socket it will try and use a standard socket directory. It won't start multiple agents if agent is already running. In addition, XDG_RUNTIME_DIR isn't always set * ssh socket if broken if --daemon is run again, so onky start if we don't have a socket * Removed unnecessary allocation of GPG_SSH_AUTH_SOCK
17 lines
434 B
Bash
17 lines
434 B
Bash
# 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's enabled
|
|
if [ -S "${AGENT_SOCK}.ssh" ]; then
|
|
export SSH_AUTH_SOCK="${AGENT_SOCK}.ssh"
|
|
unset SSH_AGENT_PID
|
|
fi
|
|
|