adam
/
prezto
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: adam:master
Branches Tags
adam:master
adam:gpg-ssh-fix
...
pull from: adam:gpg-ssh-fix
Branches Tags
adam:gpg-ssh-fix
adam:master
This repository has been archived on 2022-03-28. You can view files and clone it, but cannot push or open issues or pull requests.

4 Commits
master ... gpg-ssh-fi

Author SHA1 Message Date
Adam Goldsmith 746928646e Merge branch 'master' into gpg-ssh-fix 2015-06-11 09:54:43 -04:00
Adam Goldsmith 9f5301e16f Merge branch 'master' of https://github.com/sorin-ionescu/prezto into gpg-ssh-fix 2015-05-03 16:54:29 -04:00
Adam Goldsmith 4e012e503e Merge branch 'master' into gpg-ssh-fix 2015-05-02 18:58:40 -04:00
Adam Goldsmith 73e4345aee trying to get ssh to work nicely with gpg-agent 2015-04-27 16:58:27 -04:00
2 changed files with 13 additions and 7 deletions
Show Stats Expand all files Collapse all files

10
modules/gpg/init.zsh
View File

@ -41,12 +41,16 @@ if grep 'enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then
gpg-connect-agent UPDATESTARTUPTTY /bye >/dev/null
}
add-zsh-hook preexec _gpg-agent-update-tty
_gpg-agent-update-tty
fi
# Clean up.
unset _gpg_agent_{conf,env}
# Disable GUI prompts inside SSH.
if [[ -n "$SSH_CONNECTION" ]]; then
export PINENTRY_USER_DATA='USE_CURSES=1'
fi
#if [[ -n "$SSH_CONNECTION" ]]; then
# export PINENTRY_USER_DATA='USE_CURSES=1'
#fi
# Disable GUI prompts
export PINENTRY_USER_DATA='USE_CURSES=1'

10
modules/ssh/init.zsh
View File

@ -19,15 +19,17 @@ _ssh_agent_env="${_ssh_agent_env:-${TMPDIR:-/tmp}/ssh-agent.env}"
# Set the path to the persistent authentication socket.
_ssh_agent_sock="${TMPDIR:-/tmp}/ssh-agent.sock"
source "$_ssh_agent_env" 2> /dev/null
# Start ssh-agent if not started.
if [[ ! -S "$SSH_AUTH_SOCK" ]]; then
# Export environment variables.
source "$_ssh_agent_env" 2> /dev/null
# Start ssh-agent if not started.
if ! ps -U "$LOGNAME" -o pid,ucomm | grep -q -- "${SSH_AGENT_PID:--1} ssh-agent"; then
eval "$(ssh-agent | sed '/^echo /d' | tee "$_ssh_agent_env")"
fi
# # Start ssh-agent if not started.
# if ! ps -U "$LOGNAME" -o pid,ucomm | grep -q -- "${SSH_AGENT_PID:--1} ssh-agent"; then
# eval "$(ssh-agent | sed '/^echo /d' | tee "$_ssh_agent_env")"
# fi
fi
# Create a persistent SSH authentication socket.