re
/
cobra
forked from mirror/cobra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use pflag.ShorthandLookup

This commit is contained in:
Albert Nigmatzianov 2017-05-05 08:08:38 +02:00
parent 8f0203be89
commit 4061f41c9a
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
command.go
View File

@ -11,8 +11,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
//Package cobra is a commander providing a simple interface to create powerful modern CLI interfaces. // Package cobra is a commander providing a simple interface to create powerful modern CLI interfaces.
//In addition to providing an interface, Cobra simultaneously provides a controller to organize your application code. // In addition to providing an interface, Cobra simultaneously provides a controller to organize your application code.
package cobra package cobra
import ( import (
@ -369,8 +369,8 @@ func (c *Command) HelpTemplate() string {
{{end}}{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}` {{end}}{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`
} }
func hasNoOptDefVal(name string, f *flag.FlagSet) bool { func hasNoOptDefVal(name string, fs *flag.FlagSet) bool {
flag := f.Lookup(name) flag := fs.Lookup(name)
if flag == nil { if flag == nil {
return false return false
} }
@ -378,14 +378,15 @@ func hasNoOptDefVal(name string, f *flag.FlagSet) bool {
} }
func shortHasNoOptDefVal(name string, fs *flag.FlagSet) bool { func shortHasNoOptDefVal(name string, fs *flag.FlagSet) bool {
result := false if len(name) == 0 {
fs.VisitAll(func(flag *flag.Flag) { return false
if flag.Shorthand == name && flag.NoOptDefVal != "" {
result = true
return
} }
})
return result flag := fs.ShorthandLookup(name[:1])
if flag == nil {
return false
}
return flag.NoOptDefVal != ""
} }
func stripFlags(args []string, c *Command) []string { func stripFlags(args []string, c *Command) []string {