@@ -79,7 +79,7 @@ require (

 	github.com/prometheus/client_golang v1.14.0

 	github.com/rootless-containers/rootlesskit v1.1.0

 	github.com/sirupsen/logrus v1.9.0

-	github.com/spf13/cobra v1.6.1

+	github.com/spf13/cobra v1.7.0

 	github.com/spf13/pflag v1.0.5

 	github.com/tonistiigi/fsutil v0.0.0-20230105215944-fb433841cbfa

 	github.com/tonistiigi/go-archvariant v1.0.0

@@ -150,7 +150,7 @@ require (

 	github.com/hashicorp/go-sockaddr v1.0.2 // indirect

 	github.com/hashicorp/golang-lru v0.5.4 // indirect

 	github.com/in-toto/in-toto-golang v0.5.0 // indirect

-	github.com/inconshreveable/mousetrap v1.0.1 // indirect

+	github.com/inconshreveable/mousetrap v1.1.0 // indirect

 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect

 	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect

 	github.com/onsi/ginkgo/v2 v2.1.4 // indirect

@@ -909,8 +909,8 @@ github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK

 github.com/in-toto/in-toto-golang v0.5.0 h1:hb8bgwr0M2hGdDsLjkJ3ZqJ8JFLL/tgYdAxF/XEFBbY=

 github.com/in-toto/in-toto-golang v0.5.0/go.mod h1:/Rq0IZHLV7Ku5gielPT4wPHJfH1GdHMCq8+WPxw8/BE=

 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=

-github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=

-github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=

+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=

+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=

 github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg=

 github.com/ishidawataru/sctp v0.0.0-20230406120618-7ff4192f6ff2 h1:i2fYnDurfLlJH8AyyMOnkLHnHeP8Ff/DDpuZA/D3bPo=

 github.com/ishidawataru/sctp v0.0.0-20230406120618-7ff4192f6ff2/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg=

@@ -1327,8 +1327,8 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3

 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=

 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=

 github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=

-github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=

-github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=

+github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=

+github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=

 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=

 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=

 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=

@@ -1,3 +1,4 @@

+//go:build !windows

 // +build !windows

 package mousetrap

@@ -1,81 +1,32 @@

-// +build windows

-// +build !go1.4

-

 package mousetrap

 import (

-	"fmt"

-	"os"

 	"syscall"

 	"unsafe"

 )

-const (

-	// defined by the Win32 API

-	th32cs_snapprocess uintptr = 0x2

-)

-

-var (

-	kernel                   = syscall.MustLoadDLL("kernel32.dll")

-	CreateToolhelp32Snapshot = kernel.MustFindProc("CreateToolhelp32Snapshot")

-	Process32First           = kernel.MustFindProc("Process32FirstW")

-	Process32Next            = kernel.MustFindProc("Process32NextW")

-)

-

-// ProcessEntry32 structure defined by the Win32 API

-type processEntry32 struct {

-	dwSize              uint32

-	cntUsage            uint32

-	th32ProcessID       uint32

-	th32DefaultHeapID   int

-	th32ModuleID        uint32

-	cntThreads          uint32

-	th32ParentProcessID uint32

-	pcPriClassBase      int32

-	dwFlags             uint32

-	szExeFile           [syscall.MAX_PATH]uint16

-}

-

-func getProcessEntry(pid int) (pe *processEntry32, err error) {

-	snapshot, _, e1 := CreateToolhelp32Snapshot.Call(th32cs_snapprocess, uintptr(0))

-	if snapshot == uintptr(syscall.InvalidHandle) {

-		err = fmt.Errorf("CreateToolhelp32Snapshot: %v", e1)

-		return

+func getProcessEntry(pid int) (*syscall.ProcessEntry32, error) {

+	snapshot, err := syscall.CreateToolhelp32Snapshot(syscall.TH32CS_SNAPPROCESS, 0)

+	if err != nil {

+		return nil, err

 	}

-	defer syscall.CloseHandle(syscall.Handle(snapshot))

-

-	var processEntry processEntry32

-	processEntry.dwSize = uint32(unsafe.Sizeof(processEntry))

-	ok, _, e1 := Process32First.Call(snapshot, uintptr(unsafe.Pointer(&processEntry)))

-	if ok == 0 {

-		err = fmt.Errorf("Process32First: %v", e1)

-		return

+	defer syscall.CloseHandle(snapshot)

+	var procEntry syscall.ProcessEntry32

+	procEntry.Size = uint32(unsafe.Sizeof(procEntry))

+	if err = syscall.Process32First(snapshot, &procEntry); err != nil {

+		return nil, err

 	}

-

 	for {

-		if processEntry.th32ProcessID == uint32(pid) {

-			pe = &processEntry

-			return

+		if procEntry.ProcessID == uint32(pid) {

+			return &procEntry, nil

 		}

-

-		ok, _, e1 = Process32Next.Call(snapshot, uintptr(unsafe.Pointer(&processEntry)))

-		if ok == 0 {

-			err = fmt.Errorf("Process32Next: %v", e1)

-			return

+		err = syscall.Process32Next(snapshot, &procEntry)

+		if err != nil {

+			return nil, err

 		}

 	}

 }

-func getppid() (pid int, err error) {

-	pe, err := getProcessEntry(os.Getpid())

-	if err != nil {

-		return

-	}

-

-	pid = int(pe.th32ParentProcessID)

-	return

-}

-

 // StartedByExplorer returns true if the program was invoked by the user double-clicking

 // on the executable from explorer.exe

 //

@@ -83,16 +34,9 @@ func getppid() (pid int, err error) {

 // It does not guarantee that the program was run from a terminal. It only can tell you

 // whether it was launched from explorer.exe

 func StartedByExplorer() bool {

-	ppid, err := getppid()

+	pe, err := getProcessEntry(syscall.Getppid())

 	if err != nil {

 		return false

 	}

-

-	pe, err := getProcessEntry(ppid)

-	if err != nil {

-		return false

-	}

-

-	name := syscall.UTF16ToString(pe.szExeFile[:])

-	return name == "explorer.exe"

+	return "explorer.exe" == syscall.UTF16ToString(pe.ExeFile[:])

 }

deleted file mode 100644

@@ -1,46 +0,0 @@

-// +build windows

-// +build go1.4

-

-package mousetrap

-

-import (

-	"os"

-	"syscall"

-	"unsafe"

-)

-

-func getProcessEntry(pid int) (*syscall.ProcessEntry32, error) {

-	snapshot, err := syscall.CreateToolhelp32Snapshot(syscall.TH32CS_SNAPPROCESS, 0)

-	if err != nil {

-		return nil, err

-	}

-	defer syscall.CloseHandle(snapshot)

-	var procEntry syscall.ProcessEntry32

-	procEntry.Size = uint32(unsafe.Sizeof(procEntry))

-	if err = syscall.Process32First(snapshot, &procEntry); err != nil {

-		return nil, err

-	}

-	for {

-		if procEntry.ProcessID == uint32(pid) {

-			return &procEntry, nil

-		}

-		err = syscall.Process32Next(snapshot, &procEntry)

-		if err != nil {

-			return nil, err

-		}

-	}

-}

-

-// StartedByExplorer returns true if the program was invoked by the user double-clicking

-// on the executable from explorer.exe

-//

-// It is conservative and returns false if any of the internal calls fail.

-// It does not guarantee that the program was run from a terminal. It only can tell you

-// whether it was launched from explorer.exe

-func StartedByExplorer() bool {

-	pe, err := getProcessEntry(os.Getppid())

-	if err != nil {

-		return false

-	}

-	return "explorer.exe" == syscall.UTF16ToString(pe.ExeFile[:])

-}

@@ -1,4 +1,4 @@

-# Copyright 2013-2022 The Cobra Authors

+# Copyright 2013-2023 The Cobra Authors

 #

 # Licensed under the Apache License, Version 2.0 (the "License");

 # you may not use this file except in compliance with the License.

@@ -5,10 +5,6 @@ ifeq (, $(shell which golangci-lint))

 $(warning "could not find golangci-lint in $(PATH), run: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh")

 endif

-ifeq (, $(shell which richgo))

-$(warning "could not find richgo in $(PATH), run: go install github.com/kyoh86/richgo@latest")

-endif

-

 .PHONY: fmt lint test install_deps clean

 default: all

@@ -25,6 +21,10 @@ lint:

 test: install_deps

 	$(info ******************** running tests ********************)

+	go test -v ./...

+

+richtest: install_deps

+	$(info ******************** running tests with kyoh86/richgo ********************)

 	richgo test -v ./...

 install_deps:

@@ -1,4 +1,4 @@

-![cobra logo](https://cloud.githubusercontent.com/assets/173412/10886352/ad566232-814f-11e5-9cd0-aa101788c117.png)

+![cobra logo](assets/CobraMain.png)

 Cobra is a library for creating powerful modern CLI applications.

@@ -6,7 +6,7 @@ Cobra is used in many Go projects such as [Kubernetes](https://kubernetes.io/),

 [Hugo](https://gohugo.io), and [GitHub CLI](https://github.com/cli/cli) to

 name a few. [This list](./projects_using_cobra.md) contains a more extensive list of projects using Cobra.

-[![](https://img.shields.io/github/workflow/status/spf13/cobra/Test?longCache=tru&label=Test&logo=github%20actions&logoColor=fff)](https://github.com/spf13/cobra/actions?query=workflow%3ATest)

+[![](https://img.shields.io/github/actions/workflow/status/spf13/cobra/test.yml?branch=main&longCache=true&label=Test&logo=github%20actions&logoColor=fff)](https://github.com/spf13/cobra/actions?query=workflow%3ATest)

 [![Go Reference](https://pkg.go.dev/badge/github.com/spf13/cobra.svg)](https://pkg.go.dev/github.com/spf13/cobra)

 [![Go Report Card](https://goreportcard.com/badge/github.com/spf13/cobra)](https://goreportcard.com/report/github.com/spf13/cobra)

 [![Slack](https://img.shields.io/badge/Slack-cobra-brightgreen)](https://gophers.slack.com/archives/CD3LP1199)

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -21,7 +21,7 @@ import (

 type PositionalArgs func(cmd *Command, args []string) error

-// Legacy arg validation has the following behaviour:

+// legacyArgs validation has the following behaviour:

 // - root commands with no subcommands can take arbitrary arguments

 // - root commands with subcommands will do subcommand validity checking

 // - subcommands will always accept arbitrary arguments

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -532,7 +532,7 @@ func writeLocalNonPersistentFlag(buf io.StringWriter, flag *pflag.Flag) {

 	}

 }

-// Setup annotations for go completions for registered flags

+// prepareCustomAnnotationsForFlags setup annotations for go completions for registered flags

 func prepareCustomAnnotationsForFlags(cmd *Command) {

 	flagCompletionMutex.RLock()

 	defer flagCompletionMutex.RUnlock()

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -38,7 +38,7 @@ func genBashComp(buf io.StringWriter, name string, includeDesc bool) {

 __%[1]s_debug()

 {

-    if [[ -n ${BASH_COMP_DEBUG_FILE:-} ]]; then

+    if [[ -n ${BASH_COMP_DEBUG_FILE-} ]]; then

         echo "$*" >> "${BASH_COMP_DEBUG_FILE}"

     fi

 }

@@ -65,7 +65,7 @@ __%[1]s_get_completion_results() {

     lastChar=${lastParam:$((${#lastParam}-1)):1}

     __%[1]s_debug "lastParam ${lastParam}, lastChar ${lastChar}"

-    if [ -z "${cur}" ] && [ "${lastChar}" != "=" ]; then

+    if [[ -z ${cur} && ${lastChar} != = ]]; then

         # If the last parameter is complete (there is a space following it)

         # We add an extra empty parameter so we can indicate this to the go method.

         __%[1]s_debug "Adding extra empty parameter"

@@ -75,7 +75,7 @@ __%[1]s_get_completion_results() {

     # When completing a flag with an = (e.g., %[1]s -n=<TAB>)

     # bash focuses on the part after the =, so we need to remove

     # the flag part from $cur

-    if [[ "${cur}" == -*=* ]]; then

+    if [[ ${cur} == -*=* ]]; then

         cur="${cur#*=}"

     fi

@@ -87,7 +87,7 @@ __%[1]s_get_completion_results() {

     directive=${out##*:}

     # Remove the directive

     out=${out%%:*}

-    if [ "${directive}" = "${out}" ]; then

+    if [[ ${directive} == "${out}" ]]; then

         # There is not directive specified

         directive=0

     fi

@@ -101,22 +101,36 @@ __%[1]s_process_completion_results() {

     local shellCompDirectiveNoFileComp=%[5]d

     local shellCompDirectiveFilterFileExt=%[6]d

     local shellCompDirectiveFilterDirs=%[7]d

+    local shellCompDirectiveKeepOrder=%[8]d

-    if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then

+    if (((directive & shellCompDirectiveError) != 0)); then

         # Error code.  No completion.

         __%[1]s_debug "Received error from custom completion go code"

         return

     else

-        if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then

-            if [[ $(type -t compopt) = "builtin" ]]; then

+        if (((directive & shellCompDirectiveNoSpace) != 0)); then

+            if [[ $(type -t compopt) == builtin ]]; then

                 __%[1]s_debug "Activating no space"

                 compopt -o nospace

             else

                 __%[1]s_debug "No space directive not supported in this version of bash"

             fi

         fi

-        if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then

-            if [[ $(type -t compopt) = "builtin" ]]; then

+        if (((directive & shellCompDirectiveKeepOrder) != 0)); then

+            if [[ $(type -t compopt) == builtin ]]; then

+                # no sort isn't supported for bash less than < 4.4

+                if [[ ${BASH_VERSINFO[0]} -lt 4 || ( ${BASH_VERSINFO[0]} -eq 4 && ${BASH_VERSINFO[1]} -lt 4 ) ]]; then

+                    __%[1]s_debug "No sort directive not supported in this version of bash"

+                else

+                    __%[1]s_debug "Activating keep order"

+                    compopt -o nosort

+                fi

+            else

+                __%[1]s_debug "No sort directive not supported in this version of bash"

+            fi

+        fi

+        if (((directive & shellCompDirectiveNoFileComp) != 0)); then

+            if [[ $(type -t compopt) == builtin ]]; then

                 __%[1]s_debug "Activating no file completion"

                 compopt +o default

             else

@@ -130,7 +144,7 @@ __%[1]s_process_completion_results() {

     local activeHelp=()

     __%[1]s_extract_activeHelp

-    if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then

+    if (((directive & shellCompDirectiveFilterFileExt) != 0)); then

         # File extension filtering

         local fullFilter filter filteringCmd

@@ -143,13 +157,12 @@ __%[1]s_process_completion_results() {

         filteringCmd="_filedir $fullFilter"

         __%[1]s_debug "File filtering command: $filteringCmd"

         $filteringCmd

-    elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then

+    elif (((directive & shellCompDirectiveFilterDirs) != 0)); then

         # File completion for directories only

-        # Use printf to strip any trailing newline

         local subdir

-        subdir=$(printf "%%s" "${completions[0]}")

-        if [ -n "$subdir" ]; then

+        subdir=${completions[0]}

+        if [[ -n $subdir ]]; then

             __%[1]s_debug "Listing directories in $subdir"

             pushd "$subdir" >/dev/null 2>&1 && _filedir -d && popd >/dev/null 2>&1 || return

         else

@@ -164,7 +177,7 @@ __%[1]s_process_completion_results() {

     __%[1]s_handle_special_char "$cur" =

     # Print the activeHelp statements before we finish

-    if [ ${#activeHelp[*]} -ne 0 ]; then

+    if ((${#activeHelp[*]} != 0)); then

         printf "\n";

         printf "%%s\n" "${activeHelp[@]}"

         printf "\n"

@@ -184,21 +197,21 @@ __%[1]s_process_completion_results() {

 # Separate activeHelp lines from real completions.

 # Fills the $activeHelp and $completions arrays.

 __%[1]s_extract_activeHelp() {

-    local activeHelpMarker="%[8]s"

+    local activeHelpMarker="%[9]s"

     local endIndex=${#activeHelpMarker}

     while IFS='' read -r comp; do

-        if [ "${comp:0:endIndex}" = "$activeHelpMarker" ]; then

+        if [[ ${comp:0:endIndex} == $activeHelpMarker ]]; then

             comp=${comp:endIndex}

             __%[1]s_debug "ActiveHelp found: $comp"

-            if [ -n "$comp" ]; then

+            if [[ -n $comp ]]; then

                 activeHelp+=("$comp")

             fi

         else

             # Not an activeHelp line but a normal completion

             completions+=("$comp")

         fi

-    done < <(printf "%%s\n" "${out}")

+    done <<<"${out}"

 }

 __%[1]s_handle_completion_types() {

@@ -254,7 +267,7 @@ __%[1]s_handle_standard_completion_case() {

     done < <(printf "%%s\n" "${completions[@]}")

     # If there is a single completion left, remove the description text

-    if [ ${#COMPREPLY[*]} -eq 1 ]; then

+    if ((${#COMPREPLY[*]} == 1)); then

         __%[1]s_debug "COMPREPLY[0]: ${COMPREPLY[0]}"

         comp="${COMPREPLY[0]%%%%$tab*}"

         __%[1]s_debug "Removed description from single completion, which is now: ${comp}"

@@ -271,8 +284,8 @@ __%[1]s_handle_special_char()

     if [[ "$comp" == *${char}* && "$COMP_WORDBREAKS" == *${char}* ]]; then

         local word=${comp%%"${comp##*${char}}"}

         local idx=${#COMPREPLY[*]}

-        while [[ $((--idx)) -ge 0 ]]; do

-            COMPREPLY[$idx]=${COMPREPLY[$idx]#"$word"}

+        while ((--idx >= 0)); do

+            COMPREPLY[idx]=${COMPREPLY[idx]#"$word"}

         done

     fi

 }

@@ -298,7 +311,7 @@ __%[1]s_format_comp_descriptions()

             # Make sure we can fit a description of at least 8 characters

             # if we are to align the descriptions.

-            if [[ $maxdesclength -gt 8 ]]; then

+            if ((maxdesclength > 8)); then

                 # Add the proper number of spaces to align the descriptions

                 for ((i = ${#comp} ; i < longest ; i++)); do

                     comp+=" "

@@ -310,8 +323,8 @@ __%[1]s_format_comp_descriptions()

             # If there is enough space for any description text,

             # truncate the descriptions that are too long for the shell width

-            if [ $maxdesclength -gt 0 ]; then

-                if [ ${#desc} -gt $maxdesclength ]; then

+            if ((maxdesclength > 0)); then

+                if ((${#desc} > maxdesclength)); then

                     desc=${desc:0:$(( maxdesclength - 1 ))}

                     desc+="…"

                 fi

@@ -332,9 +345,9 @@ __start_%[1]s()

     # Call _init_completion from the bash-completion package

     # to prepare the arguments properly

     if declare -F _init_completion >/dev/null 2>&1; then

-        _init_completion -n "=:" || return

+        _init_completion -n =: || return

     else

-        __%[1]s_init_completion -n "=:" || return

+        __%[1]s_init_completion -n =: || return

     fi

     __%[1]s_debug

@@ -361,7 +374,7 @@ fi

 # ex: ts=4 sw=4 et filetype=sh

 `, name, compCmd,

 		ShellCompDirectiveError, ShellCompDirectiveNoSpace, ShellCompDirectiveNoFileComp,

-		ShellCompDirectiveFilterFileExt, ShellCompDirectiveFilterDirs,

+		ShellCompDirectiveFilterFileExt, ShellCompDirectiveFilterDirs, ShellCompDirectiveKeepOrder,

 		activeHelpMarker))

 }

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -167,8 +167,8 @@ func appendIfNotPresent(s, stringToAppend string) string {

 // rpad adds padding to the right of a string.

 func rpad(s string, padding int) string {

-	template := fmt.Sprintf("%%-%ds", padding)

-	return fmt.Sprintf(template, s)

+	formattedString := fmt.Sprintf("%%-%ds", padding)

+	return fmt.Sprintf(formattedString, s)

 }

 // tmpl executes the given template text on data, writing the result to w.

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -35,7 +35,7 @@ const FlagSetByCobraAnnotation = "cobra_annotation_flag_set_by_cobra"

 // FParseErrWhitelist configures Flag parse errors to be ignored

 type FParseErrWhitelist flag.ParseErrorsWhitelist

-// Structure to manage groups for commands

+// Group Structure to manage groups for commands

 type Group struct {

 	ID    string

 	Title string

@@ -47,7 +47,7 @@ type Group struct {

 // definition to ensure usability.

 type Command struct {

 	// Use is the one-line usage message.

-	// Recommended syntax is as follow:

+	// Recommended syntax is as follows:

 	//   [ ] identifies an optional argument. Arguments that are not enclosed in brackets are required.

 	//   ... indicates that you can specify multiple values for the previous argument.

 	//   |   indicates mutually exclusive information. You can use the argument to the left of the separator or the

@@ -321,7 +321,7 @@ func (c *Command) SetHelpCommand(cmd *Command) {

 	c.helpCommand = cmd

 }

-// SetHelpCommandGroup sets the group id of the help command.

+// SetHelpCommandGroupID sets the group id of the help command.

 func (c *Command) SetHelpCommandGroupID(groupID string) {

 	if c.helpCommand != nil {

 		c.helpCommand.GroupID = groupID

@@ -330,7 +330,7 @@ func (c *Command) SetHelpCommandGroupID(groupID string) {

 	c.helpCommandGroupID = groupID

 }

-// SetCompletionCommandGroup sets the group id of the completion command.

+// SetCompletionCommandGroupID sets the group id of the completion command.

 func (c *Command) SetCompletionCommandGroupID(groupID string) {

 	// completionCommandGroupID is used if no completion command is defined by the user

 	c.Root().completionCommandGroupID = groupID

@@ -655,20 +655,44 @@ Loop:

 // argsMinusFirstX removes only the first x from args.  Otherwise, commands that look like

 // openshift admin policy add-role-to-user admin my-user, lose the admin argument (arg[4]).

-func argsMinusFirstX(args []string, x string) []string {

-	for i, y := range args {

-		if x == y {

-			ret := []string{}

-			ret = append(ret, args[:i]...)

-			ret = append(ret, args[i+1:]...)

-			return ret

+// Special care needs to be taken not to remove a flag value.

+func (c *Command) argsMinusFirstX(args []string, x string) []string {

+	if len(args) == 0 {

+		return args

+	}

+	c.mergePersistentFlags()

+	flags := c.Flags()

+

+Loop:

+	for pos := 0; pos < len(args); pos++ {

+		s := args[pos]

+		switch {

+		case s == "--":

+			// -- means we have reached the end of the parseable args. Break out of the loop now.

+			break Loop

+		case strings.HasPrefix(s, "--") && !strings.Contains(s, "=") && !hasNoOptDefVal(s[2:], flags):

+			fallthrough

+		case strings.HasPrefix(s, "-") && !strings.Contains(s, "=") && len(s) == 2 && !shortHasNoOptDefVal(s[1:], flags):

+			// This is a flag without a default value, and an equal sign is not used. Increment pos in order to skip

+			// over the next arg, because that is the value of this flag.

+			pos++

+			continue

+		case !strings.HasPrefix(s, "-"):

+			// This is not a flag or a flag value. Check to see if it matches what we're looking for, and if so,

+			// return the args, excluding the one at this position.

+			if s == x {

+				ret := []string{}

+				ret = append(ret, args[:pos]...)

+				ret = append(ret, args[pos+1:]...)

+				return ret

+			}

 		}

 	}

 	return args

 }

 func isFlagArg(arg string) bool {

-	return ((len(arg) >= 3 && arg[1] == '-') ||

+	return ((len(arg) >= 3 && arg[0:2] == "--") ||

 		(len(arg) >= 2 && arg[0] == '-' && arg[1] != '-'))

 }

@@ -686,7 +710,7 @@ func (c *Command) Find(args []string) (*Command, []string, error) {

 		cmd := c.findNext(nextSubCmd)

 		if cmd != nil {

-			return innerfind(cmd, argsMinusFirstX(innerArgs, nextSubCmd))

+			return innerfind(cmd, c.argsMinusFirstX(innerArgs, nextSubCmd))

 		}

 		return c, innerArgs

 	}

@@ -1272,7 +1296,7 @@ func (c *Command) AllChildCommandsHaveGroup() bool {

 	return true

 }

-// ContainGroups return if groupID exists in the list of command groups.

+// ContainsGroup return if groupID exists in the list of command groups.

 func (c *Command) ContainsGroup(groupID string) bool {

 	for _, x := range c.commandgroups {

 		if x.ID == groupID {

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -77,6 +77,10 @@ const (

 	// obtain the same behavior but only for flags.

 	ShellCompDirectiveFilterDirs

+	// ShellCompDirectiveKeepOrder indicates that the shell should preserve the order

+	// in which the completions are provided

+	ShellCompDirectiveKeepOrder

+

 	// ===========================================================================

 	// All directives using iota should be above this one.

@@ -159,6 +163,9 @@ func (d ShellCompDirective) string() string {

 	if d&ShellCompDirectiveFilterDirs != 0 {

 		directives = append(directives, "ShellCompDirectiveFilterDirs")

 	}

+	if d&ShellCompDirectiveKeepOrder != 0 {

+		directives = append(directives, "ShellCompDirectiveKeepOrder")

+	}

 	if len(directives) == 0 {

 		directives = append(directives, "ShellCompDirectiveDefault")

 	}

@@ -169,7 +176,7 @@ func (d ShellCompDirective) string() string {

 	return strings.Join(directives, ", ")

 }

-// Adds a special hidden command that can be used to request custom completions.

+// initCompleteCmd adds a special hidden command that can be used to request custom completions.

 func (c *Command) initCompleteCmd(args []string) {

 	completeCmd := &Command{

 		Use:                   fmt.Sprintf("%s [command-line]", ShellCompRequestCmd),

@@ -727,7 +734,7 @@ to enable it.  You can execute the following once:

 To load completions in your current shell session:

-	source <(%[1]s completion zsh); compdef _%[1]s %[1]s

+	source <(%[1]s completion zsh)

 To load completions for every new session, execute once:

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -53,7 +53,7 @@ function __%[1]s_perform_completion

     __%[1]s_debug "last arg: $lastArg"

     # Disable ActiveHelp which is not supported for fish shell

-    set -l requestComp "%[9]s=0 $args[1] %[3]s $args[2..-1] $lastArg"

+    set -l requestComp "%[10]s=0 $args[1] %[3]s $args[2..-1] $lastArg"

     __%[1]s_debug "Calling $requestComp"

     set -l results (eval $requestComp 2> /dev/null)

@@ -89,6 +89,60 @@ function __%[1]s_perform_completion

     printf "%%s\n" "$directiveLine"

 end

+# this function limits calls to __%[1]s_perform_completion, by caching the result behind $__%[1]s_perform_completion_once_result

+function __%[1]s_perform_completion_once

+    __%[1]s_debug "Starting __%[1]s_perform_completion_once"

+

+    if test -n "$__%[1]s_perform_completion_once_result"

+        __%[1]s_debug "Seems like a valid result already exists, skipping __%[1]s_perform_completion"

+        return 0

+    end

+

+    set --global __%[1]s_perform_completion_once_result (__%[1]s_perform_completion)

+    if test -z "$__%[1]s_perform_completion_once_result"

+        __%[1]s_debug "No completions, probably due to a failure"

+        return 1

+    end

+

+    __%[1]s_debug "Performed completions and set __%[1]s_perform_completion_once_result"

+    return 0

+end

+

+# this function is used to clear the $__%[1]s_perform_completion_once_result variable after completions are run

+function __%[1]s_clear_perform_completion_once_result

+    __%[1]s_debug ""

+    __%[1]s_debug "========= clearing previously set __%[1]s_perform_completion_once_result variable =========="

+    set --erase __%[1]s_perform_completion_once_result

+    __%[1]s_debug "Succesfully erased the variable __%[1]s_perform_completion_once_result"

+end

+

+function __%[1]s_requires_order_preservation

+    __%[1]s_debug ""

+    __%[1]s_debug "========= checking if order preservation is required =========="

+

+    __%[1]s_perform_completion_once

+    if test -z "$__%[1]s_perform_completion_once_result"

+        __%[1]s_debug "Error determining if order preservation is required"

+        return 1

+    end

+

+    set -l directive (string sub --start 2 $__%[1]s_perform_completion_once_result[-1])

+    __%[1]s_debug "Directive is: $directive"

+

+    set -l shellCompDirectiveKeepOrder %[9]d

+    set -l keeporder (math (math --scale 0 $directive / $shellCompDirectiveKeepOrder) %% 2)

+    __%[1]s_debug "Keeporder is: $keeporder"

+

+    if test $keeporder -ne 0

+        __%[1]s_debug "This does require order preservation"

+        return 0

+    end

+

+    __%[1]s_debug "This doesn't require order preservation"

+    return 1

+end

+

+

 # This function does two things:

 # - Obtain the completions and store them in the global __%[1]s_comp_results

 # - Return false if file completion should be performed

@@ -99,17 +153,17 @@ function __%[1]s_prepare_completions

     # Start fresh

     set --erase __%[1]s_comp_results

-    set -l results (__%[1]s_perform_completion)

-    __%[1]s_debug "Completion results: $results"

+    __%[1]s_perform_completion_once

+    __%[1]s_debug "Completion results: $__%[1]s_perform_completion_once_result"

-    if test -z "$results"

+    if test -z "$__%[1]s_perform_completion_once_result"

         __%[1]s_debug "No completion, probably due to a failure"

         # Might as well do file completion, in case it helps

         return 1

     end

-    set -l directive (string sub --start 2 $results[-1])

-    set --global __%[1]s_comp_results $results[1..-2]

+    set -l directive (string sub --start 2 $__%[1]s_perform_completion_once_result[-1])

+    set --global __%[1]s_comp_results $__%[1]s_perform_completion_once_result[1..-2]

     __%[1]s_debug "Completions are: $__%[1]s_comp_results"

     __%[1]s_debug "Directive is: $directive"

@@ -205,13 +259,17 @@ end

 # Remove any pre-existing completions for the program since we will be handling all of them.

 complete -c %[2]s -e

+# this will get called after the two calls below and clear the $__%[1]s_perform_completion_once_result global

+complete -c %[2]s -n '__%[1]s_clear_perform_completion_once_result'

 # The call to __%[1]s_prepare_completions will setup __%[1]s_comp_results

 # which provides the program's completion choices.

-complete -c %[2]s -n '__%[1]s_prepare_completions' -f -a '$__%[1]s_comp_results'

-

+# If this doesn't require order preservation, we don't use the -k flag

+complete -c %[2]s -n 'not __%[1]s_requires_order_preservation && __%[1]s_prepare_completions' -f -a '$__%[1]s_comp_results'

+# otherwise we use the -k flag

+complete -k -c %[2]s -n '__%[1]s_requires_order_preservation && __%[1]s_prepare_completions' -f -a '$__%[1]s_comp_results'

 `, nameForVar, name, compCmd,

 		ShellCompDirectiveError, ShellCompDirectiveNoSpace, ShellCompDirectiveNoFileComp,

-		ShellCompDirectiveFilterFileExt, ShellCompDirectiveFilterDirs, activeHelpEnvVar(name)))

+		ShellCompDirectiveFilterFileExt, ShellCompDirectiveFilterDirs, ShellCompDirectiveKeepOrder, activeHelpEnvVar(name)))

 }

 // GenFishCompletion generates fish completion file and writes to the passed writer.

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -1,4 +1,4 @@

-// Copyright 2013-2022 The Cobra Authors

+// Copyright 2013-2023 The Cobra Authors

 //

 // Licensed under the Apache License, Version 2.0 (the "License");

 // you may not use this file except in compliance with the License.

@@ -77,6 +77,7 @@ filter __%[1]s_escapeStringWithSpecialChars {

     $ShellCompDirectiveNoFileComp=%[6]d

     $ShellCompDirectiveFilterFileExt=%[7]d

     $ShellCompDirectiveFilterDirs=%[8]d

+    $ShellCompDirectiveKeepOrder=%[9]d

     # Prepare the command to request completions for the program.

     # Split the command at the first space to separate the program and arguments.

@@ -106,13 +107,22 @@ filter __%[1]s_escapeStringWithSpecialChars {

         # If the last parameter is complete (there is a space following it)

         # We add an extra empty parameter so we can indicate this to the go method.

         __%[1]s_debug "Adding extra empty parameter"

-`+"        # We need to use `\"`\" to pass an empty argument a \"\" or '' does not work!!!"+`

-`+"        $RequestComp=\"$RequestComp\" + ' `\"`\"'"+`

+        # PowerShell 7.2+ changed the way how the arguments are passed to executables,

+        # so for pre-7.2 or when Legacy argument passing is enabled we need to use

+`+"        # `\"`\" to pass an empty argument, a \"\" or '' does not work!!!"+`

+        if ($PSVersionTable.PsVersion -lt [version]'7.2.0' -or

+            ($PSVersionTable.PsVersion -lt [version]'7.3.0' -and -not [ExperimentalFeature]::IsEnabled("PSNativeCommandArgumentPassing")) -or

+            (($PSVersionTable.PsVersion -ge [version]'7.3.0' -or [ExperimentalFeature]::IsEnabled("PSNativeCommandArgumentPassing")) -and

+              $PSNativeCommandArgumentPassing -eq 'Legacy')) {

+`+"             $RequestComp=\"$RequestComp\" + ' `\"`\"'"+`

+        } else {

+             $RequestComp="$RequestComp" + ' ""'

+        }

     }

     __%[1]s_debug "Calling $RequestComp"

     # First disable ActiveHelp which is not supported for Powershell

-    $env:%[9]s=0

+    $env:%[10]s=0

     #call the command store the output in $out and redirect stderr and stdout to null

     # $Out is an array contains each line per element

@@ -137,7 +147,7 @@ filter __%[1]s_escapeStringWithSpecialChars {

     }

     $Longest = 0

-    $Values = $Out | ForEach-Object {

+    [Array]$Values = $Out | ForEach-Object {

         #Split the output in name and description

 `+"        $Name, $Description = $_.Split(\"`t\",2)"+`

         __%[1]s_debug "Name: $Name Description: $Description"

@@ -182,6 +192,11 @@ filter __%[1]s_escapeStringWithSpecialChars {

         }

     }

+    # we sort the values in ascending order by name if keep order isn't passed

+    if (($Directive -band $ShellCompDirectiveKeepOrder) -eq 0 ) {

+        $Values = $Values | Sort-Object -Property Name

+    }

+

     if (($Directive -band $ShellCompDirectiveNoFileComp) -ne 0 ) {