dominic/prezto
1
0
Fork 0
Code Releases Activity

use SSH_ASKPASS variable. fixes #1478

Browse source
This commit is contained in:
Philipp A 2017-10-04 20:24:05 +02:00 • committed by GitHub
parent ba0cb8afd8
commit 5a72d7c31f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/ssh/init.zsh
View file

@ -39,11 +39,12 @@ fi
# Load identities.
if ssh-add -l 2>&1 | grep -q 'The agent has no identities'; then
zstyle -a ':prezto:module:ssh:load' identities '_ssh_identities'
_identities=("${_ssh_identities:+$_ssh_dir/${^_ssh_identities[@]}}")
# Check for Linux system and ssh-askpass presence
if [[ "$OSTYPE" == linux* ]] && [[ ! -a /usr/lib/ssh/x11-ssh-askpass ]]; then
ssh-add "${_ssh_identities:+$_ssh_dir/${^_ssh_identities[@]}}" 2> /dev/null
if [[ "$OSTYPE" == linux* && ! -x "$SSH_ASKPASS" ]]; then
ssh-add "${_identities[@]}" 2> /dev/null
else
ssh-add "${_ssh_identities:+$_ssh_dir/${^_ssh_identities[@]}}" < /dev/null 2> /dev/null
ssh-add "${_identities[@]}" < /dev/null 2> /dev/null
fi
fi