From ca8ec45f7ac6f1b7437850a5524c85241190bb1c Mon Sep 17 00:00:00 2001 From: romkatv Date: Tue, 10 Mar 2020 09:29:29 +0100 Subject: [PATCH] display only the version (without name) in `package` by default --- internal/p10k.zsh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/p10k.zsh b/internal/p10k.zsh index 18f4161c..478ce3bd 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -2085,9 +2085,10 @@ prompt_package() { if [[ -z $field ]]; then field=${s:-x} elif [[ $field == (name|version) ]]; then - (( ! $+found[$field] )) || return - [[ -n $s ]] || return - print -v 'found[$field]' -- $s # this isn't quite right but close enough + (( ! $+found[$field] )) || return + [[ -n $s ]] || return + [[ $s != *($'\n'|'\')* ]] || return + found[$field]=$s (( $#found == 2 )) && break fi ;; @@ -2102,8 +2103,7 @@ prompt_package() { P9K_PACKAGE_NAME=$_p9k__cache_val[2] P9K_PACKAGE_VERSION=$_p9k__cache_val[3] - local text="${${P9K_PACKAGE_NAME##*/}//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}" - _p9k_prompt_segment "$0" "cyan" "$_p9k_color1" PACKAGE_ICON 0 '' $text + _p9k_prompt_segment "$0" "cyan" "$_p9k_color1" PACKAGE_ICON 0 '' ${P9K_PACKAGE_VERSION//\%/%%} } ################################################################ @@ -7495,7 +7495,7 @@ _p9k_must_init() { [[ $sig == $_p9k__param_sig ]] && return 1 _p9k_deinit fi - _p9k__param_pat=$'v71\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1' + _p9k__param_pat=$'v72\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1' _p9k__param_pat+=$'${#parameters[(I)POWERLEVEL9K_*]}\1${(%):-%n%#}\1$GITSTATUS_LOG_LEVEL\1' _p9k__param_pat+=$'$GITSTATUS_ENABLE_LOGGING\1$GITSTATUS_DAEMON\1$GITSTATUS_NUM_THREADS\1' _p9k__param_pat+=$'$DEFAULT_USER\1${ZLE_RPROMPT_INDENT:-1}\1$P9K_SSH\1$__p9k_ksh_arrays\1'