1 files changed, 10 insertions, 6 deletions
diff --git a/plugins/kubectx/kubectx.plugin.zsh b/plugins/kubectx/kubectx.plugin.zsh
index abbdc254b..6096feeae 100644
--- a/plugins/kubectx/kubectx.plugin.zsh
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -1,9 +1,13 @@
-typeset -A kubectx_mapping
+typeset -g -A kubectx_mapping
 
 function kubectx_prompt_info() {
-  if [ $commands[kubectl] ]; then
-    local current_ctx=`kubectl config current-context`
-    # use value in associative array if it exists, otherwise fall back to the context name
-    echo "${kubectx_mapping[$current_ctx]:-$current_ctx}"
-  fi
+  (( $+commands[kubectl] )) || return
+
+  local current_ctx=$(kubectl config current-context 2> /dev/null)
+
+  [[ -n "$current_ctx" ]] || return
+
+  # use value in associative array if it exists
+  # otherwise fall back to the context name
+  echo "${kubectx_mapping[$current_ctx]:-${current_ctx:gs/%/%%}}"
 }