From a066b55f855c8e488d3ea9e26e861bdd5ecd4fe8 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Fri, 13 Jan 2023 12:06:20 +0100 Subject: [PATCH] don't trust P9K_SSH if it was set with a different TTY (#2154) --- internal/p10k.zsh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/p10k.zsh b/internal/p10k.zsh index 6bdaaf1da..85873ffb2 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -8310,8 +8310,9 @@ _p9k_init_ssh() { # # License: https://github.com/sindresorhus/pure/blob/e8abf9d37185ec9b7b4398ca9c5eba555a1028eb/license. - [[ -n $P9K_SSH ]] && return + [[ -n $P9K_SSH && $_P9K_SSH_TTY == $TTY ]] && return typeset -gix P9K_SSH=0 + typeset -gx _P9K_SSH_TTY=$TTY if [[ -n $SSH_CLIENT || -n $SSH_TTY || -n $SSH_CONNECTION ]]; then P9K_SSH=1 return 0 @@ -8881,7 +8882,7 @@ _p9k_deinit() { fi (( $+_p9k__iterm2_precmd )) && functions[iterm2_precmd]=$_p9k__iterm2_precmd (( $+_p9k__iterm2_decorate_prompt )) && functions[iterm2_decorate_prompt]=$_p9k__iterm2_decorate_prompt - unset -m '(_POWERLEVEL9K_|P9K_|_p9k_)*~(P9K_SSH|P9K_TOOLBOX_NAME|P9K_TTY|_P9K_TTY)' + unset -m '(_POWERLEVEL9K_|P9K_|_p9k_)*~(P9K_SSH|_P9K_SSH_TTY|P9K_TOOLBOX_NAME|P9K_TTY|_P9K_TTY)' [[ -n $__p9k_locale ]] || unset __p9k_locale }