From 64aad8e0919a1519e8f5bb78d714cb4aa55f736f Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 29 Jan 2016 19:07:54 +0100
Subject: zsh: Don’t run fasd if not installed

---
 tag-zsh/config/zsh/zshrc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tag-zsh/config/zsh')

diff --git a/tag-zsh/config/zsh/zshrc b/tag-zsh/config/zsh/zshrc
index 496a975..98fcd5e 100755
--- a/tag-zsh/config/zsh/zshrc
+++ b/tag-zsh/config/zsh/zshrc
@@ -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
-- 
cgit 1.4.1


From 4a0710cba5943f961fd89385008e23984b0492e5 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 3 Feb 2016 19:34:18 +0100
Subject: zsh: Don’t export ssh socket via SSH

---
 tag-zsh/config/zsh/zshrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tag-zsh/config/zsh')

diff --git a/tag-zsh/config/zsh/zshrc b/tag-zsh/config/zsh/zshrc
index 98fcd5e..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
-- 
cgit 1.4.1