coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-24 03:47:45 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

cmd/ipfs2: Show short help text instead for usage errors

Browse Source
This commit is contained in:
Matt Bell 2014-11-11 22:14:38 -08:00 committed by Juan Batiz-Benet
parent 93c69a83e8
commit c76a52e422
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/ipfs2/main.go
View File

@ -92,11 +92,12 @@ func createRequest(args []string) (cmds.Request, *cmds.Command, error) {
// handle parse error (which means the commandline input was wrong,
// e.g. incorrect number of args, or nonexistent subcommand)
if err != nil {
help, _ := req.Option("help").Bool()
// if the -help flag wasn't specified, show the error message
// or if a path was returned (user specified a valid subcommand), show the error message
// (this means there was an option or argument error)
if path != nil && len(path) > 0 {
help, _ := req.Option("help").Bool()
if !help {
fmt.Printf(errorFormat, err)
}
@ -106,8 +107,13 @@ func createRequest(args []string) (cmds.Request, *cmds.Command, error) {
root = commands.Root
}
// generate the help text for the command the user was trying to call (or root)
htErr := cmdsCli.LongHelp("ipfs", root, path, os.Stdout)
// show the long help text if the help flag was specified, otherwise short help text
helpFunc := cmdsCli.ShortHelp
if help {
helpFunc = cmdsCli.LongHelp
}
htErr := helpFunc("ipfs", root, path, os.Stdout)
if htErr != nil {
fmt.Println(htErr)
}
@ -210,7 +216,7 @@ func outputResponse(res cmds.Response, root *cmds.Command) error {
// if this is a client error, we try to display help text
if res.Error().Code == cmds.ErrClient {
err := cmdsCli.LongHelp("ipfs", root, res.Request().Path(), os.Stdout)
err := cmdsCli.ShortHelp("ipfs", root, res.Request().Path(), os.Stdout)
if err != nil {
fmt.Println(err)
}