Merge pull request #1183 from weaveworks/issue/1176-deal-with-help

Update pflag to avoid flag parsing gotchas
fluxcd · Jul 4, 2018 · dfa97ba · dfa97ba
2 parents 2d58c32 + 71035b2
commit dfa97ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
@@ -116,14 +116,15 @@ func main() {
 		dockerConfig = fs.String("docker-config", "", "path to a docker config to use for image registry credentials")
 	)
 
-	if err := fs.Parse(os.Args[1:]); err != nil {
+	err := fs.Parse(os.Args[1:])
+	switch {
+	case err == pflag.ErrHelp:
+		os.Exit(0)
+	case err != nil:
 		fmt.Fprintf(os.Stderr, "Error: %s\n\n", err.Error())
-		fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
-		fs.PrintDefaults()
+		fs.Usage()
 		os.Exit(2)
-	}
-
-	if *versionFlag {
+	case *versionFlag:
 		fmt.Println(version)
 		os.Exit(0)
 	}