From 176f781121c02af7c504746619eab910a457e935 Mon Sep 17 00:00:00 2001
From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
Date: Sun, 27 Nov 2022 11:45:23 +0100
Subject: assume that dotnet version may depend on the content of global.json
(#2103)
---
internal/p10k.zsh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/internal/p10k.zsh b/internal/p10k.zsh
index 9a8f52d6..2e816714 100644
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@@ -2650,7 +2650,10 @@ prompt_dotnet_version() {
if (( _POWERLEVEL9K_DOTNET_VERSION_PROJECT_ONLY )); then
_p9k_upglob 'project.json|global.json|packet.dependencies|*.csproj|*.fsproj|*.xproj|*.sln' && return
fi
- _p9k_cached_cmd 0 '' dotnet --version || return
+
+ local cfg
+ _p9k_upglob global.json || cfg=$_p9k__parent_dirs[$?]/global.json
+ _p9k_cached_cmd 0 "$cfg" dotnet --version || return
_p9k_prompt_segment "$0" "magenta" "white" 'DOTNET_ICON' 0 '' "$_p9k__ret"
}
@@ -8334,7 +8337,7 @@ _p9k_must_init() {
[[ $sig == $_p9k__param_sig ]] && return 1
_p9k_deinit
fi
- _p9k__param_pat=$'v137\1'${(q)ZSH_VERSION}$'\1'${(q)ZSH_PATCHLEVEL}$'\1'
+ _p9k__param_pat=$'v138\1'${(q)ZSH_VERSION}$'\1'${(q)ZSH_PATCHLEVEL}$'\1'
_p9k__param_pat+=$__p9k_force_term_shell_integration$'\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'
--
cgit v1.2.3