Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #262 by separating new PROMPT_COMMAND commands #269

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix #262 by separating new PROMPT_COMMAND commands
mrmanc authored Aug 22, 2019

Verified

This commit was signed with the committer’s verified signature.
codebytere Shelley Vohr
commit 065ab44ac4eaa42fd12abc224d78e8fd7efb9171
5 changes: 5 additions & 0 deletions z.sh
Original file line number Diff line number Diff line change
@@ -247,6 +247,11 @@ elif type 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 || {
# Check if there are existing PROMPT_COMMANDs that are not terminated with a semicolon
if [[ "$PROMPT_COMMAND" =~ ^[^\ ]+ ]] && ! [[ "$PROMPT_COMMAND" =~ ^.*\;\ *$ ]]
then # terminate it
PROMPT_COMMAND="$PROMPT_COMMAND; "
fi
PROMPT_COMMAND="$PROMPT_COMMAND"$'\n''(_z --add "$(command pwd '$_Z_RESOLVE_SYMLINKS' 2>/dev/null)" 2>/dev/null &);'
}
}