Merge pull request #367 from Scalingo/fix/365/err-msg

Correctly display help whe nthe users types an unknown command
Scalingo · Jul 4, 2018 · 5d1a9e9 · 5d1a9e9
2 parents 406aad2 + cd4ba80
commit 5d1a9e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -10,6 +10,7 @@ Changelog
 
 * [logs] accepts filter for postdeploy and one-off container
 * [authentication] use of the new authentication API `auth.scalingo.com`
+* [help] fix missing help with unknown commsnds #365
 
 ### 1.7.0
 

diff --git a/cmd/help.go b/cmd/help.go
@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"github.com/urfave/cli"
 	"github.com/Scalingo/cli/cmd/autocomplete"
+	"github.com/urfave/cli"
 )
 
 var (
@@ -13,9 +13,8 @@ var (
 			args := c.Args()
 			if args.Present() {
 				cli.ShowCommandHelp(c, args.First())
-			} else {
-				cli.ShowAppHelp(c)
 			}
+			cli.ShowAppHelp(c)
 		},
 		BashComplete: func(c *cli.Context) {
 			autocomplete.CmdFlagsAutoComplete(c, "help")

diff --git a/scalingo/main.go b/scalingo/main.go
@@ -89,7 +89,8 @@ COMMANDS:{{range .VisibleCategories}}{{if .Name}}
 		 {{end}}{{end}}{{if .VisibleFlags}}
 GLOBAL OPTIONS:
    {{range $index, $option := .VisibleFlags}}{{if $index}}
-   {{end}}{{$option}}{{end}}{{end}}{{if .Copyright}}
+   {{end}}{{$option}}{{end}}{{end}}
+{{if .Copyright}}
 
 COPYRIGHT:
    {{.Copyright}}{{end}}