Do not display usage when GetPrinter fails
authorMikael Berthe <mikael@lilotux.net>
Sun, 07 May 2017 11:46:28 +0200
changeset 81 b1671f83e91b
parent 80 7f3e2577ed85
child 82 9ac2281c07d7
Do not display usage when GetPrinter fails Only display the error message and exit with non-zero status code.
cmd/accounts.go
cmd/config.go
cmd/instance.go
cmd/media.go
cmd/notifications.go
cmd/search.go
cmd/status.go
cmd/stream.go
cmd/timelines.go
cmd/version.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, "")
 }
--- 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, "")
 }
--- 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, "")
 }
--- 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, "")
 }
--- 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, "")
 }
--- 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, "")
 }
--- 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, "")
 }
--- 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:
--- 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, "")
 }
--- 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, "")
 	},