From d5f30a3ae4e0c9efd9abeb59e05638d55cbc0dd6 Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Sat, 12 Mar 2022 15:48:26 +0100
Subject: [PATCH] fix: use removal flag with correct help

---
 cli/app/secret.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/cli/app/secret.go b/cli/app/secret.go
index 5b235467..571f992d 100644
--- a/cli/app/secret.go
+++ b/cli/app/secret.go
@@ -27,6 +27,13 @@ var allSecretsFlag = &cli.BoolFlag{
 	Usage:       "Generate all secrets",
 }
 
+var rmAllSecrets bool
+var rmAllSecretsFlag = &cli.BoolFlag{
+	Name:        "all, a",
+	Destination: &rmAllSecrets,
+	Usage:       "Remove all secrets",
+}
+
 var appSecretGenerateCommand = cli.Command{
 	Name:      "generate",
 	Aliases:   []string{"g"},
@@ -178,7 +185,7 @@ var appSecretRmCommand = cli.Command{
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.NoInputFlag,
-		allSecretsFlag,
+		rmAllSecretsFlag,
 		internal.PassRemoveFlag,
 	},
 	Before:       internal.SubCommandBefore,
@@ -195,11 +202,11 @@ Example:
 		app := internal.ValidateApp(c)
 		secrets := secret.ReadSecretEnvVars(app.Env)
 
-		if c.Args().Get(1) != "" && allSecrets {
+		if c.Args().Get(1) != "" && rmAllSecrets {
 			internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<secret-name>' and '--all' together"))
 		}
 
-		if c.Args().Get(1) == "" && !allSecrets {
+		if c.Args().Get(1) == "" && !rmAllSecrets {
 			internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
 		}