From 5741d9044d88f97833f8d086a8d3b3c4aff7958e Mon Sep 17 00:00:00 2001 From: rupa Date: Wed, 5 Feb 2014 18:04:38 -0500 Subject: [PATCH 1/2] Fix sed errors on OSX, without breaking ubuntu h/t @Keithbsmiley. Closes #125 --- z.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/z.sh b/z.sh index 786bdfd..b2955b0 100644 --- a/z.sh +++ b/z.sh @@ -107,7 +107,7 @@ _z() { -*) local opt=${1:1}; while [ "$opt" ]; do case ${opt:0:1} in c) local fnd="^$PWD $fnd";; h) echo "${_Z_CMD:-z} [-chlrtx] args" >&2; return;; - x) sed -i "\:^${PWD}|.*:d" "$datafile";; + x) sed -i -e "\:^${PWD}|.*:d" "$datafile";; l) local list=1;; r) local typ="rank";; t) local typ="recent";; From f1801e79793c7b8fb4759c7e0ae0334d70844919 Mon Sep 17 00:00:00 2001 From: Li Ge Date: Thu, 15 May 2014 10:28:40 -0700 Subject: [PATCH 2/2] use command pwd instead of pwd --- z.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/z.sh b/z.sh index b2955b0..b254c5e 100644 --- a/z.sh +++ b/z.sh @@ -236,7 +236,7 @@ elif complete >/dev/null 2>&1; then [ "$_Z_NO_PROMPT_COMMAND" ] || { # populate directory list. avoid clobbering other PROMPT_COMMANDs. grep "_z --add" <<< "$PROMPT_COMMAND" >/dev/null || { - PROMPT_COMMAND="$PROMPT_COMMAND"$'\n''_z --add "$(pwd '$_Z_RESOLVE_SYMLINKS' 2>/dev/null)" 2>/dev/null;' + PROMPT_COMMAND="$PROMPT_COMMAND"$'\n''_z --add "$(command pwd '$_Z_RESOLVE_SYMLINKS' 2>/dev/null)" 2>/dev/null;' } } fi