Tack-Support/powerlevel10k
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clean up the handling of POWERLEVEL9K_AZURE_CLASSES and put it in all configs (#2379)

Browse source 
This reverts commit 343d4f44e5, reversing
changes made to 4dca4bdfbb.
This commit is contained in:
Roman Perepelitsa 2023-07-11 10:53:52 +02:00
commit 078497570f
5 changed files with 112 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/p10k.zsh
View file

@ -4643,9 +4643,10 @@ _p9k_prompt_java_version_init() {
}
prompt_azure() {
local cfg=${AZURE_CONFIG_DIR:-$HOME/.azure}/azureProfile.json
if ! _p9k_cache_stat_get $0 $cfg; then
local name
local name cfg=${AZURE_CONFIG_DIR:-$HOME/.azure}/azureProfile.json
if _p9k_cache_stat_get $0 $cfg; then
name=$_p9k__cache_val[1]
else
if (( $+commands[jq] )) && name="$(jq -r '[.subscriptions[]|select(.isDefault==true)|.name][]|strings' $cfg 2>/dev/null)"; then
name=${name%%$'\n'*}
elif ! name="$(az account show --query name --output tsv 2>/dev/null)"; then
@ -4653,16 +4654,15 @@ prompt_azure() {
fi
_p9k_cache_stat_set "$name"
fi
[[ -n $name ]] || return
local pat class state
for pat class in "${_POWERLEVEL9K_AZURE_CLASSES[@]}"; do
name="${_p9k__cache_val[1]//\%/%%}"
if [[ $name == ${~pat} ]]; then
[[ -n $class ]] && state=_${${(U)class}//İ/I}
break
fi
done
[[ -n $_p9k__cache_val[1] ]] || return
_p9k_prompt_segment "$0$state" "blue" "white" "AZURE_ICON" 0 '' "${_p9k__cache_val[1]//\%/%%}"
_p9k_prompt_segment "$0$state" "blue" "white" "AZURE_ICON" 0 '' "${name//\%/%%}"
}
_p9k_prompt_azure_init() {
@ -9375,7 +9375,7 @@ if [[ $__p9k_dump_file != $__p9k_instant_prompt_dump_file && -n $__p9k_instant_p
zf_rm -f -- $__p9k_instant_prompt_dump_file{,.zwc} 2>/dev/null
fi
typeset -g P9K_VERSION=1.19.1
typeset -g P9K_VERSION=1.19.2
unset VSCODE_SHELL_INTEGRATION
_p9k_init_ssh