# HG changeset patch # User Mikael Berthe # Date 1494150388 -7200 # Node ID b1671f83e91b4b9a774cd0476f90ed9483f4ec6a # Parent 7f3e2577ed8513e9ae55dbebfbd04f0e86c7ad5c Do not display usage when GetPrinter fails Only display the error message and exit with non-zero status code. diff -r 7f3e2577ed85 -r b1671f83e91b cmd/accounts.go --- a/cmd/accounts.go Sun May 07 00:37:02 2017 +0200 +++ b/cmd/accounts.go Sun May 07 11:46:28 2017 +0200 @@ -538,7 +538,8 @@ p, err := getPrinter() if err != nil { - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } return p.PrintObj(obj, nil, "") } diff -r 7f3e2577ed85 -r b1671f83e91b cmd/config.go --- a/cmd/config.go Sun May 07 00:37:02 2017 +0200 +++ b/cmd/config.go Sun May 07 11:46:28 2017 +0200 @@ -88,7 +88,8 @@ p, err = getPrinter() } if err != nil { - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } return p.PrintObj(gClient, nil, "") } @@ -105,7 +106,8 @@ p, err := getPrinter() if err != nil { - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } return p.PrintObj(gClient.UserToken, nil, "") } diff -r 7f3e2577ed85 -r b1671f83e91b cmd/instance.go --- a/cmd/instance.go Sun May 07 00:37:02 2017 +0200 +++ b/cmd/instance.go Sun May 07 11:46:28 2017 +0200 @@ -70,7 +70,8 @@ p, err := getPrinter() if err != nil { - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } return p.PrintObj(i, nil, "") } @@ -122,7 +123,8 @@ p, err := getPrinter() if err != nil { - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } return p.PrintObj(obj, nil, "") } diff -r 7f3e2577ed85 -r b1671f83e91b cmd/media.go --- a/cmd/media.go Sun May 07 00:37:02 2017 +0200 +++ b/cmd/media.go Sun May 07 11:46:28 2017 +0200 @@ -51,7 +51,8 @@ p, err := getPrinter() if err != nil { - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } return p.PrintObj(attachment, nil, "") } diff -r 7f3e2577ed85 -r b1671f83e91b cmd/notifications.go --- a/cmd/notifications.go Sun May 07 00:37:02 2017 +0200 +++ b/cmd/notifications.go Sun May 07 11:46:28 2017 +0200 @@ -100,7 +100,8 @@ p, err := getPrinter() if err != nil { - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } return p.PrintObj(obj, nil, "") } diff -r 7f3e2577ed85 -r b1671f83e91b cmd/search.go --- a/cmd/search.go Sun May 07 00:37:02 2017 +0200 +++ b/cmd/search.go Sun May 07 11:46:28 2017 +0200 @@ -52,7 +52,8 @@ p, err := getPrinter() if err != nil { - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } return p.PrintObj(results, nil, "") } diff -r 7f3e2577ed85 -r b1671f83e91b cmd/status.go --- a/cmd/status.go Sun May 07 00:37:02 2017 +0200 +++ b/cmd/status.go Sun May 07 11:46:28 2017 +0200 @@ -272,7 +272,8 @@ p, err := getPrinter() if err != nil { - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } return p.PrintObj(obj, nil, "") } diff -r 7f3e2577ed85 -r b1671f83e91b cmd/stream.go --- a/cmd/stream.go Sun May 07 00:37:02 2017 +0200 +++ b/cmd/stream.go Sun May 07 11:46:28 2017 +0200 @@ -150,7 +150,8 @@ close(stop) <-done close(evChan) - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } LISTEN: diff -r 7f3e2577ed85 -r b1671f83e91b cmd/timelines.go --- a/cmd/timelines.go Sun May 07 00:37:02 2017 +0200 +++ b/cmd/timelines.go Sun May 07 11:46:28 2017 +0200 @@ -84,7 +84,8 @@ p, err := getPrinter() if err != nil { - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } return p.PrintObj(sl, nil, "") } diff -r 7f3e2577ed85 -r b1671f83e91b cmd/version.go --- a/cmd/version.go Sun May 07 00:37:02 2017 +0200 +++ b/cmd/version.go Sun May 07 11:46:28 2017 +0200 @@ -6,6 +6,8 @@ package cmd import ( + "os" + "github.com/spf13/cobra" "github.com/McKael/madon" @@ -43,7 +45,8 @@ p, err = getPrinter() } if err != nil { - return err + errPrint("Error: %s", err.Error()) + os.Exit(1) } return p.PrintObj(v, nil, "") },