Skip to content

K
k3s
Unverified Commit 1ba03c04 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #61129 from juanvallejo/jvallejo/fix-zsh-completion-debug

Automatic merge from submit-queue (batch tested with PRs 61129, 60359). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix kubectl_filedir completion Fixes https://github.com/kubernetes/kubernetes/issues/61017 **Release note**: ```release-note NONE ``` Issue was reproduced and verified fixed using steps from https://github.com/kubernetes/kubernetes/issues/61017#issuecomment-372650701 kubectl was checked outside of the above environment, to ensure it worked in local environment as well cc @seans3 @soltysh
parents 9f776575 3dc952e7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
cmd/kubeadm/app/cmd/completion.go
View file @ 1ba03c04
......@@ -210,7 +210,7 @@ __kubeadm_get_comp_words_by_ref() {
__kubeadm_filedir() {
local RET OLD_IFS w qw
__debug "_filedir $@ cur=$cur"
__kubectl_debug "_filedir $@ cur=$cur"
if [[ "$1" = \~* ]]; then
# somehow does not work. Maybe, zsh does not call this at all
eval echo "$1"
......@@ -227,7 +227,7 @@ __kubeadm_filedir() {
fi
IFS="$OLD_IFS"
IFS="," __debug "RET=${RET[@]} len=${#RET[@]}"
IFS="," __kubectl_debug "RET=${RET[@]} len=${#RET[@]}"
for w in ${RET[@]}; do
if [[ ! "${w}" = "${cur}"* ]]; then
......
pkg/kubectl/cmd/cmd.go
View file @ 1ba03c04
......@@ -141,7 +141,7 @@ __kubectl_get_containers()
{
local template
template="{{ range .spec.containers }}{{ .name }} {{ end }}"
__debug "${FUNCNAME} nouns are ${nouns[*]}"
__kubectl_debug "${FUNCNAME} nouns are ${nouns[*]}"
local len="${#nouns[@]}"
if [[ ${len} -ne 1 ]]; then
......
pkg/kubectl/cmd/completion.go
View file @ 1ba03c04
......@@ -223,7 +223,7 @@ __kubectl_get_comp_words_by_ref() {
__kubectl_filedir() {
local RET OLD_IFS w qw
__debug "_filedir $@ cur=$cur"
__kubectl_debug "_filedir $@ cur=$cur"
if [[ "$1" = \~* ]]; then
# somehow does not work. Maybe, zsh does not call this at all
eval echo "$1"
......@@ -240,7 +240,7 @@ __kubectl_filedir() {
fi
IFS="$OLD_IFS"
IFS="," __debug "RET=${RET[@]} len=${#RET[@]}"
IFS="," __kubectl_debug "RET=${RET[@]} len=${#RET[@]}"
for w in ${RET[@]}; do
if [[ ! "${w}" = "${cur}"* ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment