]> git.rmz.io Git - dotfiles.git/commitdiff
zsh: Only set SSH_AUTH_SOCK when not already set
authorSamir Benmendil <me@rmz.io>
Wed, 10 Jul 2019 22:11:54 +0000 (22:11 +0000)
committerSamir Benmendil <me@rmz.io>
Wed, 10 Jul 2019 22:11:54 +0000 (22:11 +0000)
This allows ssh's ForwardAgent to work.

zshenv

diff --git a/zshenv b/zshenv
index 7875aa479f7bb10d3c04e7d5a981ed23b24b479d..26ef6e63af624ef04aea0821e3a0fa75ea08e4ea 100644 (file)
--- a/zshenv
+++ b/zshenv
@@ -8,7 +8,7 @@ export HOST=$(hostname)
 # gpg
 export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
 # ssh
-export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+export SSH_AUTH_SOCK=${SSH_AUTH_SOCK:-"$XDG_RUNTIME_DIR/ssh-agent.socket"}
 
 export MAILDIR="$HOME/mail"
 
@@ -50,9 +50,6 @@ export MPLAYER_HOME="$XDG_CONFIG_HOME/mplayer"
 # pass
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
 
-# SSH Agent
-export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
-
 # weechat
 export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"