commit 4724f36ee77fc04e6fd8e75dd4c32e508bfe07a5 parent 061257acd3c88e09b270d7c78e588a6c93b5659f Author: Daniel Moch <daniel@danielmoch.com> Date: Fri, 8 Jun 2018 20:15:17 -0400 Move SSH_AUTH_SOCK export to .profile Diffstat:
M | .profile | | | 10 | ++++++++++ |
M | .shrc | | | 10 | ---------- |
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.profile b/.profile @@ -75,6 +75,16 @@ __addpath "$HOME/.local/bin" "before" unset __addpath export PATH +if [ -z "$SSH_TTY" ] && type gpgconf > /dev/null 2>&1 +then + if [ "`gpgconf --list-dirs agent-ssh-socket | wc -l`" -eq 1 ] + then + unset SSH_AGENT_PID + SSH_AUTH_SOCK=`gpgconf --list-dirs agent-ssh-socket` + export SSH_AUTH_SOCK + fi +fi + if type my-init > /dev/null 2>&1 && [ ! -f "$HOME/._.djmoch" ] then my-init diff --git a/.shrc b/.shrc @@ -72,16 +72,6 @@ if type gpg-connect-agent > /dev/null 2>&1 then GPG_TTY=`tty`; export GPG_TTY gpg-connect-agent updatestartuptty /bye > /dev/null 2>&1 - - if [ -z "$SSH_TTY" ] && type gpgconf > /dev/null 2>&1 - then - if [ "`gpgconf --list-dirs agent-ssh-socket | wc -l`" -eq 1 ] - then - unset SSH_AGENT_PID - SSH_AUTH_SOCK=`gpgconf --list-dirs agent-ssh-socket` - export SSH_AUTH_SOCK - fi - fi fi if [ ! -f "$HOME/.hushlogin" ]