diff options
| author | Ryan Kavanagh <rak@debian.org> | 2012-05-06 11:24:35 -0400 |
|---|---|---|
| committer | Ryan Kavanagh <rak@debian.org> | 2012-05-06 11:28:40 -0400 |
| commit | 77d1db0dfe22199d2e8d30cc7bf0ef2345db3594 (patch) | |
| tree | e5fb8b98aafe63cd04d67c7be9951f59d0892b74 /.zsh | |
| parent | Fix bug in GPG disable (diff) | |
Add toggle for keychain, we don't need it on the server
Diffstat (limited to '')
| -rw-r--r-- | .zshrc | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -773,10 +773,12 @@ NO_verbose \ # GPG / SSH AGENT -keychain id_rsa -keychain -Q ${GPGKEY} ${GPGKEY1} -[ -z "$HOSTNAME" ] && HOSTNAME=`uname -n` -[ -f $HOME/.keychain/$HOSTNAME-sh ] && - . $HOME/.keychain/$HOSTNAME-sh -[ -f $HOME/.keychain/$HOSTNAME-sh-gpg ] && - . $HOME/.keychain/$HOSTNAME-sh-gpg +if [[ "KEYCHAIN" = "True" ]]; then + keychain id_rsa + keychain -Q ${GPGKEY} ${GPGKEY1} + [ -z "$HOSTNAME" ] && HOSTNAME=`uname -n` + [ -f $HOME/.keychain/$HOSTNAME-sh ] && + . $HOME/.keychain/$HOSTNAME-sh + [ -f $HOME/.keychain/$HOSTNAME-sh-gpg ] && + . $HOME/.keychain/$HOSTNAME-sh-gpg +fi |