Skip to content

GitLab

Commit 2c87f85a authored by Paweł Czochański's avatar Paweł Czochański Committed by Robby Russell
Browse files

Fix wrong $GNUPGHOME usage in gpg-agent plugin (#6403) 

$GNUPGHOME variable was used incorrectly and caused a grep error when
set.
parent 7a7480b9
Show whitespace changes
Inline Side-by-side
plugins/gpg-agent/gpg-agent.plugin.zsh
View file @ 2c87f85a
...@@ -6,7 +6,7 @@ if [ ! -S $GPG_AGENT_SOCKET ]; then ...@@ -6,7 +6,7 @@ if [ ! -S $GPG_AGENT_SOCKET ]; then
fi fi
# Set SSH to use gpg-agent if it is configured to do so # Set SSH to use gpg-agent if it is configured to do so
GNUPGCONFIG=${GNUPGHOME:-"$HOME/.gnupg/gpg-agent.conf"} GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then
unset SSH_AGENT_PID unset SSH_AGENT_PID
export SSH_AUTH_SOCK=$GPG_AGENT_SOCKET export SSH_AUTH_SOCK=$GPG_AGENT_SOCKET
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment