From 023af72e46045426906a795edcaebed16f260059 Mon Sep 17 00:00:00 2001 From: webb Date: Fri, 4 Sep 2020 10:55:35 -0400 Subject: [PATCH] Output errors to STDERR, add description for the usage page, etc --- main.go | 11 +++++++---- upload.go | 3 +-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index 6356841..508c7b8 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,6 @@ package main import ( "gitea.com/webb/teal" "github.com/urfave/cli" - "log" "os" ) @@ -13,14 +12,17 @@ var itCl = teal.Client{ func main() { cli := &cli.App{ + Name: "interrupt", + Usage: "a simple CLI for pxl.blue", + Description: "This is a simple CLI for pxl.blue. You can upload images, get account information and more.", Commands: []*cli.Command{ { Name: "upload", Aliases: []string{"u"}, Usage: "upload a file", Action: func(c *cli.Context) error { - uploadHandler(c.Args().First()) - return nil + err := uploadHandler(c.Args().First()) + return err }, }, { @@ -43,6 +45,7 @@ func main() { err := cli.Run(os.Args) if err != nil { - log.Fatal(err) + os.Stderr.WriteString("interrupt: " + err.Error() + "\n") + os.Exit(1) } } diff --git a/upload.go b/upload.go index 3922d67..aeadbb5 100644 --- a/upload.go +++ b/upload.go @@ -9,8 +9,7 @@ import ( func uploadHandler(a string) error { uploadKey, err := getUploadKey() if err != nil { - fmt.Println(err) - os.Exit(1) + return err } var reader io.Reader