Merge branch 'master' of github.com:alanpearce/dotfiles
1 file changed, 4 insertions(+), 4 deletions(-)
changed files
M tag-zsh/config/zsh/zshrc → tag-zsh/config/zsh/zshrc
@@ -30,7 +30,7 @@ ) users=(alan root toor) -if [[ $os == "gnu" ]] +if [[ $os == "gnu" && -z $SSH_CLIENT ]] then export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket" fi@@ -355,12 +355,12 @@ fi fi } -_FASD_DATA="$HOME/.cache/zsh/fasd-data" -if [[ -e ~/.config/zsh/fasd.zsh ]] +if [[ -n $commands[fasd] && -e ~/.config/zsh/fasd.zsh ]] then + _FASD_DATA="$HOME/.cache/zsh/fasd-data" source ~/.config/zsh/fasd.zsh else - echo "fasd init file is missing." + echo "fasd not enabled." fi case $os in