summaryrefslogtreecommitdiffstats
path: root/utils/utils.go
diff options
context:
space:
mode:
Diffstat (limited to 'utils/utils.go')
-rw-r--r--utils/utils.go18
1 files changed, 1 insertions, 17 deletions
diff --git a/utils/utils.go b/utils/utils.go
index ea89ec745..7bb9e5852 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -2,7 +2,6 @@ package utils
import (
"os"
- "strings"
jww "github.com/spf13/jwalterweatherman"
)
@@ -23,7 +22,7 @@ func CheckErr(err error, s ...string) {
func StopOnErr(err error, s ...string) {
if err != nil {
if len(s) == 0 {
- newMessage := cutUsageMessage(err.Error())
+ newMessage := err.Error()
// Printing an empty string results in a error with
// no message, no bueno.
@@ -32,8 +31,6 @@ func StopOnErr(err error, s ...string) {
}
} else {
for _, message := range s {
- message := cutUsageMessage(message)
-
if message != "" {
jww.CRITICAL.Println(message)
}
@@ -42,16 +39,3 @@ func StopOnErr(err error, s ...string) {
os.Exit(-1)
}
}
-
-// cutUsageMessage splits the incoming string on the beginning of the usage
-// message text. Anything in the first element of the returned slice, trimmed
-// of its Unicode defined spaces, should be returned. The 2nd element of the
-// slice will have the usage message that we wish to elide.
-//
-// This is done because Cobra already prints Hugo's usage message; not eliding
-// would result in the usage output being printed twice, which leads to bug
-// reports, more specifically: https://github.com/spf13/hugo/issues/374
-func cutUsageMessage(s string) string {
- pieces := strings.Split(s, "Usage of")
- return strings.TrimSpace(pieces[0])
-}