From 335717ef088b9f84002830dc1acf46850095ecae Mon Sep 17 00:00:00 2001
From: rupa <rupa.deadwyler@vistarmedia.com>
Date: Thu, 21 Jul 2016 13:09:14 -0400
Subject: [PATCH 1/2] fix -e without breaking zsh

---
 z.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/z.sh b/z.sh
index 160a6c0..077b487 100644
--- a/z.sh
+++ b/z.sh
@@ -202,7 +202,9 @@ _z() {
             }
         ')"
 
-        [ $? -eq 0 ] && [ "$cd" ] && $echo builtin cd "$cd"
+        [ $? -eq 0 ] && [ "$cd" ] && {
+          if [ "$echo" ]; then echo "$cd"; else builtin cd "$cd"; fi
+        }
     fi
 }
 

From 78f0d97d3dd334109fb42502c1b3d46c9ab3482d Mon Sep 17 00:00:00 2001
From: rupa <rupa.deadwyler@vistarmedia.com>
Date: Thu, 21 Jul 2016 13:10:24 -0400
Subject: [PATCH 2/2] silence error from zsh when datafile is created

---
 z.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z.sh b/z.sh
index 077b487..d807bed 100644
--- a/z.sh
+++ b/z.sh
@@ -57,7 +57,7 @@ _z() {
 
         # maintain the data file
         local tempfile="$datafile.$RANDOM"
-        awk < <( _z_dirs ) -v path="$*" -v now="$(date +%s)" -F"|" '
+        awk < <(_z_dirs 2>/dev/null) -v path="$*" -v now="$(date +%s)" -F"|" '
             BEGIN {
                 rank[path] = 1
                 time[path] = now