Tweaks to the CLI to ensure consistent behavior with previous versions

cmd/main.go

@@ -22,47 +22,36 @@ var (
 
 func main() {
 	app := &cli.App{
-		Name:                 "hysteria",
+		Name:                 "Hysteria",
-		Usage:                "A TCP/UDP relay & SOCKS5/HTTP proxy tool",
+		Usage:                "a TCP/UDP relay & SOCKS5/HTTP proxy tool optimized for poor network environments",
 		Version:              fmt.Sprintf("%s %s %s", appVersion, appDate, appCommit),
 		Authors:              []*cli.Author{{Name: "HyNetwork <https://github.com/HyNetwork>"}},
 		EnableBashCompletion: true,
-		Action: func(c *cli.Context) error {
+		Action:               clientAction,
-			return cli.ShowAppHelp(c)
+		Flags:                commonFlags(),
-		},
+		Before:               initApp,
 		Commands: []*cli.Command{
 			{
 				Name:   "server",
 				Usage:  "Run as server mode",
-				Before: initApp,
+				Action: serverAction,
-				Flags:  commonFlags(),
-				Action: func(c *cli.Context) error {
-					cbs, err := ioutil.ReadFile(c.String("config"))
-					if err != nil {
-						logrus.WithFields(logrus.Fields{
-							"file":  c.String("config"),
-							"error": err,
-						}).Fatal("Failed to read configuration")
-					}
-
-					// server mode
-					sc, err := parseServerConfig(cbs)
-					if err != nil {
-						logrus.WithFields(logrus.Fields{
-							"file":  c.String("config"),
-							"error": err,
-						}).Fatal("Failed to parse server configuration")
-					}
-					server(sc)
-					return nil
-				},
 			},
 			{
 				Name:   "client",
 				Usage:  "Run as client mode",
-				Before: initApp,
+				Action: clientAction,
-				Flags:  commonFlags(),
+			},
-				Action: func(c *cli.Context) error {
+		},
+	}
+
+	err := app.Run(os.Args)
+	if err != nil {
+		logrus.Fatal(err)
+	}
+
+}
+
+func clientAction(c *cli.Context) error {
 	cbs, err := ioutil.ReadFile(c.String("config"))
 	if err != nil {
 		logrus.WithFields(logrus.Fields{
@@ -70,7 +59,6 @@ func main() {
 			"error": err,
 		}).Fatal("Failed to read configuration")
 	}
-
 	// client mode
 	cc, err := parseClientConfig(cbs)
 	if err != nil {
@@ -81,16 +69,26 @@ func main() {
 	}
 	client(cc)
 	return nil
-				},
-			},
-		},
 }
 
-	err := app.Run(os.Args)
+func serverAction(c *cli.Context) error {
+	cbs, err := ioutil.ReadFile(c.String("config"))
 	if err != nil {
-		logrus.Fatal(err)
+		logrus.WithFields(logrus.Fields{
+			"file":  c.String("config"),
+			"error": err,
+		}).Fatal("Failed to read configuration")
 	}
-
+	// server mode
+	sc, err := parseServerConfig(cbs)
+	if err != nil {
+		logrus.WithFields(logrus.Fields{
+			"file":  c.String("config"),
+			"error": err,
+		}).Fatal("Failed to parse server configuration")
+	}
+	server(sc)
+	return nil
 }
 
 func parseServerConfig(cb []byte) (*serverConfig, error) {