Fix daemon synopsis and command grouping (#4249)

internal/cmd/main.go

@@ -298,7 +298,7 @@ func groupedHelpFunc(f cli.HelpFunc) cli.HelpFunc {
 		typeSpecificCommands := make([]string, 0, len(commands)-cap(genericCommands)-cap(clientCommands))
 		for k := range commands {
 			switch k {
-			case "authenticate", "config", "connect", "dev", "logout", "server":
+			case "authenticate", "config", "connect", "daemon", "dev", "logout", "search", "server":
 				clientCommands = append(clientCommands, k)
 			case "read", "update", "delete":
 				genericCommands = append(genericCommands, k)

internal/cmd/search_cmd_darwin.go

@@ -14,7 +14,11 @@ func init() {
 	clientCacheWrapper = daemonWrap
 
 	extraCommandsFuncs = append(extraCommandsFuncs, func(ui, serverCmdUi cli.Ui, runOpts *RunOptions) {
-		delete(Commands, "daemon")
+		Commands["daemon"] = func() (cli.Command, error) {
+			return &daemon.DaemonCommand{
+				Command: base.NewCommand(ui),
+			}, nil
+		}
 		Commands["daemon start"] = func() (cli.Command, error) {
 			return &daemon.StartCommand{
 				Command: base.NewCommand(ui),

internal/cmd/search_cmd_freebsd.go

@@ -16,7 +16,11 @@ func init() {
 	clientCacheWrapper = daemonWrap
 
 	extraCommandsFuncs = append(extraCommandsFuncs, func(ui, serverCmdUi cli.Ui, runOpts *RunOptions) {
-		delete(Commands, "daemon")
+		Commands["daemon"] = func() (cli.Command, error) {
+			return &daemon.DaemonCommand{
+				Command: base.NewCommand(ui),
+			}, nil
+		}
 		Commands["daemon start"] = func() (cli.Command, error) {
 			return &daemon.StartCommand{
 				Command: base.NewCommand(ui),

internal/cmd/search_cmd_linux.go

@@ -14,7 +14,11 @@ func init() {
 	clientCacheWrapper = daemonWrap
 
 	extraCommandsFuncs = append(extraCommandsFuncs, func(ui, serverCmdUi cli.Ui, runOpts *RunOptions) {
-		delete(Commands, "daemon")
+		Commands["daemon"] = func() (cli.Command, error) {
+			return &daemon.DaemonCommand{
+				Command: base.NewCommand(ui),
+			}, nil
+		}
 		Commands["daemon start"] = func() (cli.Command, error) {
 			return &daemon.StartCommand{
 				Command: base.NewCommand(ui),

internal/cmd/search_cmd_windows.go

@@ -16,7 +16,11 @@ func init() {
 	clientCacheWrapper = daemonWrap
 
 	extraCommandsFuncs = append(extraCommandsFuncs, func(ui, serverCmdUi cli.Ui, runOpts *RunOptions) {
-		delete(Commands, "daemon")
+		Commands["daemon"] = func() (cli.Command, error) {
+			return &daemon.DaemonCommand{
+				Command: base.NewCommand(ui),
+			}, nil
+		}
 		Commands["daemon start"] = func() (cli.Command, error) {
 			return &daemon.StartCommand{
 				Command: base.NewCommand(ui),