43c68566be2cddd094bd2228a053769107c8a47f

Message

chore(kube-ps1): update to 04af46f7

Diff

This diff is truncated to protect this page.

  1diff --git a/.github/dependencies.yml b/.github/dependencies.yml
  2index 254196920dbaa86999136c5069bd76ef6c10349e..6ae21ed2ad4ea05b9607321acf5ccef48d824037 100644
  3--- a/.github/dependencies.yml
  4+++ b/.github/dependencies.yml
  5@@ -30,7 +30,7 @@ dependencies:
  6   plugins/kube-ps1:
  7     repo: jonmosco/kube-ps1
  8     branch: master
  9-    version: 7d575c6d53f60130159a3db28e33d2967201cd64
 10+    version: 04af46f7fe888ad287abcab6699b9bb10234bc3d
 11     precopy: |
 12       set -e
 13       find . ! -name kube-ps1.sh ! -name LICENSE ! -name README.md -delete
 14diff --git a/plugins/kube-ps1/kube-ps1.plugin.zsh b/plugins/kube-ps1/kube-ps1.plugin.zsh
 15index f59b92df9dee181f0ba8b08656d011d9f4933936..6d81e48322c7f835e8928b668c95fc81c66e3c8e 100644
 16--- a/plugins/kube-ps1/kube-ps1.plugin.zsh
 17+++ b/plugins/kube-ps1/kube-ps1.plugin.zsh
 18@@ -49,7 +49,7 @@ _kube_ps1_shell_type() {
 19   elif [ "${BASH_VERSION-}" ]; then
 20     _KUBE_PS1_SHELL_TYPE="bash"
 21   fi
 22-  echo $_KUBE_PS1_SHELL_TYPE
 23+  echo "$_KUBE_PS1_SHELL_TYPE"
 24 }
 25 
 26 _kube_ps1_init() {
 27@@ -65,6 +65,15 @@ _kube_ps1_init() {
 28     _KUBE_PS1_TPUT_AVAILABLE=false
 29   fi
 30 
 31+  # Detect stat type once (not needed for zsh which uses zstat builtin)
 32+  if [[ "${_KUBE_PS1_SHELL}" != "zsh" ]]; then
 33+    if stat -c "%s" /dev/null &> /dev/null; then
 34+      _KUBE_PS1_STAT_TYPE="gnu"
 35+    else
 36+      _KUBE_PS1_STAT_TYPE="bsd"
 37+    fi
 38+  fi
 39+
 40   case "${_KUBE_PS1_SHELL}" in
 41     "zsh")
 42       _KUBE_PS1_OPEN_ESC="%{"
 43@@ -98,8 +107,8 @@ _kube_ps1_color_fg() {
 44     magenta) _KUBE_PS1_FG_CODE=5;;
 45     cyan) _KUBE_PS1_FG_CODE=6;;
 46     white) _KUBE_PS1_FG_CODE=7;;
 47-    # 256
 48-    [0-9]|[1-9][0-9]|[1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-6]) _KUBE_PS1_FG_CODE="${1}";;
 49+    # 256 colors
 50+    [0-9]|[1-9][0-9]|[1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5]) _KUBE_PS1_FG_CODE="${1}";;
 51     *) _KUBE_PS1_FG_CODE=default
 52   esac
 53 
 54@@ -111,7 +120,7 @@ _kube_ps1_color_fg() {
 55   elif [[ "${_KUBE_PS1_SHELL}" == "bash" ]]; then
 56     if [[ "${_KUBE_PS1_TPUT_AVAILABLE}" == "true" ]]; then
 57       _KUBE_PS1_FG_CODE="$(tput setaf "${_KUBE_PS1_FG_CODE}")"
 58-    elif [[ $_KUBE_PS1_FG_CODE -ge 0 ]] && [[ $_KUBE_PS1_FG_CODE -le 256 ]]; then
 59+    elif [[ $_KUBE_PS1_FG_CODE -ge 0 ]] && [[ $_KUBE_PS1_FG_CODE -le 255 ]]; then
 60       _KUBE_PS1_FG_CODE="\033[38;5;${_KUBE_PS1_FG_CODE}m"
 61     else
 62       _KUBE_PS1_FG_CODE="${_KUBE_PS1_DEFAULT_FG}"
 63@@ -131,20 +140,20 @@ _kube_ps1_color_bg() {
 64     magenta) _KUBE_PS1_BG_CODE=5;;
 65     cyan) _KUBE_PS1_BG_CODE=6;;
 66     white) _KUBE_PS1_BG_CODE=7;;
 67-    # 256
 68-    [0-9]|[1-9][0-9]|[1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-6]) _KUBE_PS1_BG_CODE="${1}";;
 69-    *) _KUBE_PS1_BG_CODE=$'\033[0m';;
 70+    # 256 colors
 71+    [0-9]|[1-9][0-9]|[1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5]) _KUBE_PS1_BG_CODE="${1}";;
 72+    *) _KUBE_PS1_BG_CODE=default
 73   esac
 74 
 75   if [[ "${_KUBE_PS1_BG_CODE}" == "default" ]]; then
 76-    _KUBE_PS1_FG_CODE="${_KUBE_PS1_DEFAULT_BG}"
 77+    _KUBE_PS1_BG_CODE="${_KUBE_PS1_DEFAULT_BG}"
 78     return
 79   elif [[ "${_KUBE_PS1_SHELL}" == "zsh" ]]; then
 80     _KUBE_PS1_BG_CODE="%K{$_KUBE_PS1_BG_CODE}"
 81   elif [[ "${_KUBE_PS1_SHELL}" == "bash" ]]; then
 82     if [[ "${_KUBE_PS1_TPUT_AVAILABLE}" == "true" ]]; then
 83       _KUBE_PS1_BG_CODE="$(tput setab "${_KUBE_PS1_BG_CODE}")"
 84-    elif [[ $_KUBE_PS1_BG_CODE -ge 0 ]] && [[ $_KUBE_PS1_BG_CODE -le 256 ]]; then
 85+    elif [[ $_KUBE_PS1_BG_CODE -ge 0 ]] && [[ $_KUBE_PS1_BG_CODE -le 255 ]]; then
 86       _KUBE_PS1_BG_CODE="\033[48;5;${_KUBE_PS1_BG_CODE}m"
 87     else
 88       _KUBE_PS1_BG_CODE="${_KUBE_PS1_DEFAULT_BG}"
 89@@ -154,7 +163,7 @@ _kube_ps1_color_bg() {
 90 }
 91 
 92 _kube_ps1_binary_check() {
 93-  command -v $1 >/dev/null
 94+  command -v "$1" >/dev/null
 95 }
 96 
 97 _kube_ps1_symbol() {
 98@@ -171,6 +180,7 @@ _kube_ps1_symbol() {
 99   local oc_glyph=$'\ue7b7'
100   local oc_symbol_color=red
101   local custom_symbol_color="${KUBE_PS1_SYMBOL_COLOR:-$k8s_symbol_color}"
102+  local KUBE_PS1_RESET_COLOR="${_KUBE_PS1_OPEN_ESC}${_KUBE_PS1_DEFAULT_FG}${_KUBE_PS1_CLOSE_ESC}"
103 
104   # Choose the symbol based on the provided argument or environment variable
105   case "${symbol_arg}" in
106@@ -225,15 +235,27 @@ _kube_ps1_file_newer_than() {
107   if [[ "${_KUBE_PS1_SHELL}" == "zsh" ]]; then
108     # Use zstat '-F %s.%s' to make it compatible with low zsh version (eg: 5.0.2)
109     mtime=$(zstat -L +mtime -F %s.%s "${file}")
110-  elif stat -c "%s" /dev/null &> /dev/null; then
111-    # GNU stat
112+  elif [[ "${_KUBE_PS1_STAT_TYPE}" == "gnu" ]]; then
113     mtime=$(stat -L -c %Y "${file}")
114   else
115-    # BSD stat
116     mtime=$(stat -L -f %m "$file")
117   fi