From e4da11776a6ecabd0177a9a6710a43ba3c3359d0 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Thu, 8 May 2014 19:31:00 +0300 Subject: [PATCH] bashrc & zshrc: ssh-add: use keyring with OS X. Via https://help.github.com/articles/working-with-ssh-key-passphrases#platform-mac --- bashrc | 5 ++++- zshrc | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bashrc b/bashrc index 4d5a82d4..0552be55 100644 --- a/bashrc +++ b/bashrc @@ -119,6 +119,7 @@ if [[ $UNAME = Darwin ]]; then alias ls="ls -Gp" alias ll="ls -alFHGp" alias l="ls -CFGp" + alias ssh-add="\ssh-add -D && \ssh-add -K" fi # Add an "alert" alias for long running commands. Use like so: @@ -390,7 +391,9 @@ alias KILL="killall -KILL " alias rsync-folder="rsync -h --progress -azvv " # SSHGuard seems to prefer users to run this always when connecting with keys in ssh-agent... -alias ssh-add="\ssh-add -D && \ssh-add " +if [[ $UNAME != Darwin ]]; then + alias ssh-add="\ssh-add -D && \ssh-add " +fi # Use GPG2 instead of GPG! # alias gpg=gpg2 # MKAYSIGREP # MKAYSIGREPALIAS diff --git a/zshrc b/zshrc index 7d5e65c8..e228923f 100644 --- a/zshrc +++ b/zshrc @@ -328,6 +328,7 @@ if [[ $UNAME = Darwin ]]; then alias ls="ls -Gp" alias ll="ls -alFHGp" alias l="ls -CFGp" + alias ssh-add="\ssh-add -D && \ssh-add -K" fi # Add an "alert" alias for long running commands. Use like so: @@ -355,7 +356,9 @@ alias KILL="killall -KILL " alias rsync-folder="rsync -h --progress -azvv " # SSHGuard seems to prefer users to run this always when connecting with keys in ssh-agent... -alias ssh-add="\ssh-add -D && \ssh-add " +if [[ $UNAME != Darwin ]]; then + alias ssh-add="\ssh-add -D && \ssh-add " +fi # Use GPG2 instead of GPG! #alias gpg=gpg2 # MKAYSIGREP MKAYSIGREPALIAS