Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert to checking if
enable-ssh-support
is set
Fixes #6772
- Loading branch information
Showing
1 changed file
with
7 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,16 @@ | ||
# 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` | ||
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 | ||
if [[ ! -S $AGENT_SOCK ]]; then | ||
gpg-agent --daemon --use-standard-socket &>/dev/null | ||
fi | ||
export GPG_TTY=$(tty) | ||
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" | ||
GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf" | ||
if [[ -r $GNUPGCONFIG ]] && command grep -q enable-ssh-support "$GNUPGCONFIG"; then | ||
export SSH_AUTH_SOCK="$AGENT_SOCK.ssh" | ||
unset SSH_AGENT_PID | ||
fi | ||
|