diff options
Diffstat (limited to 'sh/profile.d/keychain.sh')
-rw-r--r-- | sh/profile.d/keychain.sh | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sh/profile.d/keychain.sh b/sh/profile.d/keychain.sh index 55306ad4..66c23d32 100644 --- a/sh/profile.d/keychain.sh +++ b/sh/profile.d/keychain.sh @@ -1,17 +1,9 @@ # ssh-askpass setup -if command -v ssh-askpass >/dev/null 2>&1 ; then - SSH_ASKPASS=$(command -v ssh-askpass) +[ -n "${SSH_ASKPASS:="$(command -v ssh-askpass 2>&1)"}" ] && export SSH_ASKPASS -fi # keychain setup -if command -v keychain >/dev/null 2>&1 ; then +command -v keychain >/dev/null 2>&1 && eval "$(TERM=${TERM:-ansi} keychain \ - --eval --ignore-missing --quiet id_dsa id_rsa id_ecsda)" - - # Set and export TTY/GPG_TTY for interactive shells - if [ -t 0 ] ; then - GPG_TTY=$(tty) - export GPG_TTY - fi -fi + --eval --ignore-missing --quick --quiet \ + id_dsa id_rsa id_ecsda)" |