From 4580ea9dc8225a43986c01783741dbdd20b5cb2f Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Tue, 9 Jul 2024 16:43:10 +0200
Subject: [PATCH] fix: hide help sub-command & persist help flag

---
 cli/app/app.go             | 9 +++++----
 cli/catalogue/catalogue.go | 7 ++++---
 cli/cli.go                 | 8 ++++++++
 cli/recipe/recipe.go       | 1 +
 cli/server/server.go       | 7 ++++---
 cli/updater/updater.go     | 3 ++-
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/cli/app/app.go b/cli/app/app.go
index a4f0c570..93af1a17 100644
--- a/cli/app/app.go
+++ b/cli/app/app.go
@@ -5,10 +5,11 @@ import (
 )
 
 var AppCommand = cli.Command{
-	Name:      "app",
-	Aliases:   []string{"a"},
-	Usage:     "Manage apps",
-	ArgsUsage: "<domain>",
+	Name:            "app",
+	Aliases:         []string{"a"},
+	Usage:           "Manage apps",
+	ArgsUsage:       "<domain>",
+	HideHelpCommand: true,
 	Commands: []*cli.Command{
 		&appBackupCommand,
 		&appCheckCommand,
diff --git a/cli/catalogue/catalogue.go b/cli/catalogue/catalogue.go
index 98848ed3..b247a8aa 100644
--- a/cli/catalogue/catalogue.go
+++ b/cli/catalogue/catalogue.go
@@ -20,9 +20,10 @@ import (
 )
 
 var catalogueGenerateCommand = cli.Command{
-	Name:    "generate",
-	Aliases: []string{"g"},
-	Usage:   "Generate the recipe catalogue",
+	Name:            "generate",
+	Aliases:         []string{"g"},
+	Usage:           "Generate the recipe catalogue",
+	HideHelpCommand: true,
 	Flags: []cli.Flag{
 		internal.NoInputFlag,
 		internal.PublishFlag,
diff --git a/cli/cli.go b/cli/cli.go
index 17c528dc..8ddc4746 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -167,6 +167,7 @@ func newAbraApp(version, commit string) *cli.Command {
 		},
 		EnableShellCompletion:  true,
 		UseShortOptionHandling: true,
+		HideHelpCommand:        true,
 		ShellComplete:          autocomplete.SubcommandComplete,
 	}
 
@@ -194,6 +195,13 @@ func newAbraApp(version, commit string) *cli.Command {
 		return nil
 	}
 
+	cli.HelpFlag = &cli.BoolFlag{
+		Name:       "help",
+		Aliases:    []string{"h, H"},
+		Usage:      "Show help",
+		Persistent: true,
+	}
+
 	return app
 }
 
diff --git a/cli/recipe/recipe.go b/cli/recipe/recipe.go
index 4ab7b251..77bc6872 100644
--- a/cli/recipe/recipe.go
+++ b/cli/recipe/recipe.go
@@ -19,6 +19,7 @@ for you.
 Anyone who uses a recipe can become a maintainer. Maintainers typically make
 sure the recipe is in good working order and the config upgraded in a timely
 manner.`,
+	HideHelpCommand: true,
 	Commands: []*cli.Command{
 		&recipeFetchCommand,
 		&recipeLintCommand,
diff --git a/cli/server/server.go b/cli/server/server.go
index 99c963b8..bb6bb53b 100644
--- a/cli/server/server.go
+++ b/cli/server/server.go
@@ -6,9 +6,10 @@ import (
 
 // ServerCommand defines the `abra server` command and its subcommands
 var ServerCommand = cli.Command{
-	Name:    "server",
-	Aliases: []string{"s"},
-	Usage:   "Manage servers",
+	Name:            "server",
+	Aliases:         []string{"s"},
+	Usage:           "Manage servers",
+	HideHelpCommand: true,
 	Commands: []*cli.Command{
 		&serverAddCommand,
 		&serverListCommand,
diff --git a/cli/updater/updater.go b/cli/updater/updater.go
index f0a1d4ff..921f353f 100644
--- a/cli/updater/updater.go
+++ b/cli/updater/updater.go
@@ -480,7 +480,8 @@ func newAbraApp(version, commit string) *cli.Command {
    \____\___/       \___/| .__/   \____|_|\___/ \__,_|\__,_|
                          |_|
 `,
-		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
+		Version:         fmt.Sprintf("%s-%s", version, commit[:7]),
+		HideHelpCommand: true,
 		Commands: []*cli.Command{
 			&Notify,
 			&UpgradeApp,