From 37655e9f7c34fba12543bd6a8f5d6a38a84f6370 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sun, 11 May 2008 13:14:59 +0100 Subject: [PATCH] fix prompt for paths with spaces --- .zsh/zshrc/60_vcsprompt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt index 4da474a..2a672be 100644 --- a/.zsh/zshrc/60_vcsprompt +++ b/.zsh/zshrc/60_vcsprompt @@ -129,7 +129,7 @@ __vcs_get_prompt_path_components() prefix="%${prelen}<..<%-${precomps}~%<<" prefix="${(%)prefix}" - echo "$prefix" "$branch" "$postfix" + echo "'$prefix'" "'$branch'" "'$postfix'" } __vcs_set_prompt_variables() @@ -144,23 +144,22 @@ __vcs_set_prompt_variables() { error "could not determine git repository root"; return 1 } branch="$(__git_get_branch)" || { error "could not determine git branch"; return 1 } - set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch") + eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch") [ -d "$GIT_DIR" ] && set -- "$GIT_DIR" "$2" "$1" - set +x ;; hg) reporoot="$(__hg_get_reporoot)" || { error "could not determine hg repository root"; return 1 } branch="$(__hg_get_branch)" || { error "could not determine hg branch"; return 1 } - set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch") + eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch") ;; bzr) reporoot="$(__bzr_get_reporoot)" || { error "could not determine bzr repository root"; return 1 } branch="$(__bzr_get_branch)" || { error "could not determine bzr branch"; return 1 } - set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch") + eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch") ;; *) case "$repotype" in -- 2.39.2