wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmd/completion: Simplify code

Browse source 
Fallout from d69ce6794b

https://github.com/containers/toolbox/pull/1114
This commit is contained in:
Debarshi Ray 2022-09-08 17:50:26 +02:00
parent 7cad4dc60c
commit 284a2bdf39
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/cmd/completion.go
View file

@ -72,17 +72,13 @@ func completionCommands(cmd *cobra.Command, _ []string, _ string) ([]string, cob
}
func completionContainerNames(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
containerNames := []string{}
var containerNames []string
if containers, err := getContainers(); err == nil {
for _, container := range containers {
containerNames = append(containerNames, container.Names[0])
}
}
if len(containerNames) == 0 {
return nil, cobra.ShellCompDirectiveNoFileComp
}
return containerNames, cobra.ShellCompDirectiveNoFileComp
}
@ -91,7 +87,7 @@ func completionContainerNamesFiltered(cmd *cobra.Command, args []string, _ strin
return nil, cobra.ShellCompDirectiveNoFileComp
}
containerNames := []string{}
var containerNames []string
if containers, err := getContainers(); err == nil {
for _, container := range containers {
skip := false
@ -110,10 +106,6 @@ func completionContainerNamesFiltered(cmd *cobra.Command, args []string, _ strin
}
}
if len(containerNames) == 0 {
return nil, cobra.ShellCompDirectiveNoFileComp
}
return containerNames, cobra.ShellCompDirectiveNoFileComp
}
@ -135,7 +127,7 @@ func completionImageNames(cmd *cobra.Command, _ []string, _ string) ([]string, c
return nil, cobra.ShellCompDirectiveNoFileComp
}
imageNames := []string{}
var imageNames []string
if images, err := getImages(); err == nil {
for _, image := range images {
if len(image.Names) > 0 {
@ -146,15 +138,11 @@ func completionImageNames(cmd *cobra.Command, _ []string, _ string) ([]string, c
}
}
if len(imageNames) == 0 {
return nil, cobra.ShellCompDirectiveNoFileComp
}
return imageNames, cobra.ShellCompDirectiveNoFileComp
}
func completionImageNamesFiltered(_ *cobra.Command, args []string, _ string) ([]string, cobra.ShellCompDirective) {
imageNames := []string{}
var imageNames []string
if images, err := getImages(); err == nil {
for _, image := range images {
skip := false
@ -181,10 +169,6 @@ func completionImageNamesFiltered(_ *cobra.Command, args []string, _ string) ([]
}
}
if len(imageNames) == 0 {
return nil, cobra.ShellCompDirectiveNoFileComp
}
return imageNames, cobra.ShellCompDirectiveNoFileComp
}