diff options
| author | Alan Pearce | 2016-02-08 09:45:00 +0100 |
|---|---|---|
| committer | Alan Pearce | 2016-02-08 09:45:00 +0100 |
| commit | 0b94384382c0fb6e83d85feb1f6a0548f778c84b (patch) | |
| tree | cf64ee9c20483d4e0f04909dff778ff944493754 /tag-zsh | |
| parent | e743a4e8d3949bd1e64907485bec741cfb00a08b (diff) | |
| parent | 90aaf93d952a5f56755379d50f6a8999322e37c4 (diff) | |
| download | dotfiles-0b94384382c0fb6e83d85feb1f6a0548f778c84b.tar.lz dotfiles-0b94384382c0fb6e83d85feb1f6a0548f778c84b.tar.zst dotfiles-0b94384382c0fb6e83d85feb1f6a0548f778c84b.zip | |
Merge branch 'master' of github.com:alanpearce/dotfiles
Diffstat (limited to 'tag-zsh')
| -rwxr-xr-x | tag-zsh/config/zsh/zshrc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tag-zsh/config/zsh/zshrc b/tag-zsh/config/zsh/zshrc index 496a975..73dad6d 100755 --- a/tag-zsh/config/zsh/zshrc +++ b/tag-zsh/config/zsh/zshrc @@ -30,7 +30,7 @@ hosts=( 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 @@ ec () { 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 |