bug fixes: don't replace '_' with ' ' in gke clusters and clear the default of POWERLEVEL9K_KUBECONTEXT_SHORTEN

pull/141/head
romkatv 5 years ago
parent da7d986333
commit 2318bda2c3

@ -2925,16 +2925,15 @@ prompt_kubecontext() {
case $shorten in case $shorten in
gke) gke)
# gke_projectname_availability-zone_cluster-01 => cluster-01 # gke_projectname_availability-zone_cluster-01 => cluster-01
if [[ $cluster == gke_* ]]; then if [[ $cluster == (#b)gke_[^_]#_[^_]#_(?*) ]]; then
local parts=(${(s:_:)cluster}) text=$match[1]
(( $#parts > 3 )) && text=$parts[4,-1]
break break
fi fi
;; ;;
eks) eks)
# arn:aws:eks:us-east-1:XXXXXXXXXXXX:cluster/eks-infra # arn:aws:eks:us-east-1:123456789012:cluster/eks-infra
if [[ $cluster == (#b)arn:aws:eks:[[:alnum:]-]##:[[:digit:]]##:cluster/(*) ]]; then if [[ $cluster == (#b)arn:aws:eks:[[:alnum:]-]##:[[:digit:]]##:cluster/(?*) ]]; then
[[ -n $match[1] ]] && text=$match[1] text=$match[1]
break break
fi fi
esac esac
@ -3716,7 +3715,7 @@ _p9k_init_params() {
_p9k_declare -e POWERLEVEL9K_NODEENV_LEFT_DELIMITER "[" _p9k_declare -e POWERLEVEL9K_NODEENV_LEFT_DELIMITER "["
_p9k_declare -e POWERLEVEL9K_NODEENV_RIGHT_DELIMITER "]" _p9k_declare -e POWERLEVEL9K_NODEENV_RIGHT_DELIMITER "]"
_p9k_declare -b POWERLEVEL9K_KUBECONTEXT_SHOW_DEFAULT_NAMESPACE 1 _p9k_declare -b POWERLEVEL9K_KUBECONTEXT_SHOW_DEFAULT_NAMESPACE 1
_p9k_declare -a POWERLEVEL9K_KUBECONTEXT_SHORTEN -- gke eks _p9k_declare -a POWERLEVEL9K_KUBECONTEXT_SHORTEN --
# Defines context classes for the purpose of applying different styling to different contexts. # Defines context classes for the purpose of applying different styling to different contexts.
# #
# POWERLEVEL9K_KUBECONTEXT_CLASSES must be an array with even number of elements. The first # POWERLEVEL9K_KUBECONTEXT_CLASSES must be an array with even number of elements. The first

Loading…
Cancel
Save