matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-25 21:19:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update how we set SSH_AUTH_SOCK.

Browse Source
This commit is contained in:
David Tomaschik
2020-05-31 13:41:28 -07:00
parent 7f9a3774ae
commit ee83a40686
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dotfiles/zshrc.d/gpg.zsh
View File

@@ -20,13 +20,19 @@ fi
# Inform gpg-agent of the current TTY for user prompts. # Inform gpg-agent of the current TTY for user prompts.
export GPG_TTY="$(tty)" export GPG_TTY="$(tty)"
# Integrate with the SSH module. # Setup SSH agent support
if grep '^enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then if grep '^enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then
# Load required functions. # Load required functions.
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook
# Override the ssh-agent environment file default path. if test -z "$SSH_AUTH_SOCK" ; then
_ssh_agent_env="$_gpg_agent_env" SSH_AUTH_SOCK="/run/user/$(id -u)/gnupg/S.gpg-agent.ssh"
if test -S "$SSH_AUTH_SOCK" ; then
export SSH_AUTH_SOCK
else
unset SSH_AUTH_SOCK
fi
fi
# Updates the GPG-Agent TTY before every command since SSH does not set it. # Updates the GPG-Agent TTY before every command since SSH does not set it.
function _gpg-agent-update-tty { function _gpg-agent-update-tty {