X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/37655e9f7c34fba12543bd6a8f5d6a38a84f6370..077178cc5a249b192b9d0c62832409b322553a73:/.zsh/zshrc/60_vcsprompt?ds=sidebyside diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt index 2a672be..d72e205 100644 --- a/.zsh/zshrc/60_vcsprompt +++ b/.zsh/zshrc/60_vcsprompt @@ -84,8 +84,7 @@ __vcs_get_prompt_path_components() # shortcut: if there are no arguments, return a default prompt if [ -z "${1:-}" ]; then - pwdnamed="%${_PROMPT_PATH_MAXLEN}<..<%~%<<" - pwdnamed="${(%)pwdnamed}" + pwdnamed="${(%):-%${_PROMPT_PATH_MAXLEN}<..<%~%<<}" echo "$pwdnamed" return fi @@ -96,8 +95,8 @@ __vcs_get_prompt_path_components() # replace named directories in the PWD, we need thi for the proper component # count later - local pwdnamed="%~" - pwdnamed="${(%)pwdnamed}" + local pwdnamed + pwdnamed="${(%):-%~}" # store paths in arrays for component count calculation typeset -la apwd apwdnamed areporoot @@ -114,10 +113,7 @@ __vcs_get_prompt_path_components() precomps=$(($#apwdnamed - $postcomps)) local postfix - if (( $postcomps > 0 )); then - postfix="%${postcomps}~" - postfix="${(%)postfix}" - fi + (( $postcomps > 0 )) && postfix="${(%):-%${postcomps}~}" # we don't want the prompt to get too long, so keep the total prompt length # under $_PROMPT_PATH_MAXLEN (25), but ensure that the prefix is not shorter @@ -126,8 +122,7 @@ __vcs_get_prompt_path_components() prelen=$((${_PROMPT_PATH_MAXLEN:-25} - $#branch - $#postfix)) minlen=${_PROMPT_PATH_MINLEN:-10} (( $prelen < $minlen )) && prelen=$minlen - prefix="%${prelen}<..<%-${precomps}~%<<" - prefix="${(%)prefix}" + prefix="${(%):-%${prelen}<..<%-${precomps}~%<<}" echo "'$prefix'" "'$branch'" "'$postfix'" } @@ -145,7 +140,13 @@ __vcs_set_prompt_variables() branch="$(__git_get_branch)" || { error "could not determine git branch"; return 1 } eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch") - [ -d "$GIT_DIR" ] && set -- "$GIT_DIR" "$2" "$1" + if [ -d "$GIT_DIR" ]; then + # poor man's replace until I find out how to do named dirs properly + # here: + _D="${GIT_DIR/$HOME/~}" + set -- "$_D" "$2" "${${1#$_D}%/}" + unset _D + fi ;; hg) reporoot="$(__hg_get_reporoot)" || @@ -174,9 +175,7 @@ __vcs_set_prompt_variables() return esac - psvar[1]="$1" - psvar[2]="$2" - psvar[3]="$3" + psvar[1,3]=($1 $2 $3) } if ! is_root; then