actually, do "check which commands should not do anything without nam…

…es (e.g. set) and output usage #134" better
ITRS-Group · Jun 22, 2023 · 65a058a · 65a058a
1 parent b8159e8
commit 65a058a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/tools/geneos/cmd/cfgcmd/set.go b/tools/geneos/cmd/cfgcmd/set.go
@@ -51,9 +51,11 @@ geneos config set config.rebuild=always
 		"wildcard":     "false",
 		"needshomedir": "false",
 	},
-	RunE: func(command *cobra.Command, _ []string) (err error) {
+	RunE: func(command *cobra.Command, origargs []string) (err error) {
 		_, _, params := cmd.CmdArgsParams(command)
-
+		if len(origargs) == 0 && command.Flags().NFlag() == 0 {
+			return command.Usage()
+		}
 		cf, _ := config.Load(cmd.Execname,
 			config.IgnoreSystemDir(),
 			config.IgnoreWorkingDir(),

diff --git a/tools/geneos/cmd/cfgcmd/unset.go b/tools/geneos/cmd/cfgcmd/unset.go
@@ -47,8 +47,11 @@ var configUnsetCmd = &cobra.Command{
 		"wildcard":     "false",
 		"needshomedir": "false",
 	},
-	RunE: func(command *cobra.Command, _ []string) error {
+	RunE: func(command *cobra.Command, origargs []string) error {
 		var changed bool
+		if len(origargs) == 0 && command.Flags().NFlag() == 0 {
+			return command.Usage()
+		}
 
 		_, args := cmd.CmdArgs(command)
 		orig, _ := config.Load(cmd.Execname, config.IgnoreWorkingDir(), config.IgnoreSystemDir())

diff --git a/tools/geneos/cmd/hostcmd/set.go b/tools/geneos/cmd/hostcmd/set.go
@@ -64,7 +64,10 @@ var hostSetCmd = &cobra.Command{
 		"wildcard":     "false",
 		"needshomedir": "false",
 	},
-	RunE: func(command *cobra.Command, _ []string) (err error) {
+	RunE: func(command *cobra.Command, origargs []string) (err error) {
+		if len(origargs) == 0 && command.Flags().NFlag() == 0 {
+			return command.Usage()
+		}
 		_, args, params := cmd.CmdArgsParams(command)
 		var password string
 		var hosts []*geneos.Host

diff --git a/tools/geneos/cmd/set.go b/tools/geneos/cmd/set.go
@@ -68,7 +68,7 @@ geneos set ...
 		"needshomedir": "true",
 	},
 	RunE: func(cmd *cobra.Command, origargs []string) error {
-		if len(origargs) == 0 {
+		if len(origargs) == 0 && cmd.Flags().NFlag() == 0 {
 			return cmd.Usage()
 		}
 		ct, args, params := CmdArgsParams(cmd)

diff --git a/tools/geneos/cmd/unset.go b/tools/geneos/cmd/unset.go
@@ -70,7 +70,10 @@ geneos unset san -g Gateway1
 		"wildcard":     "true",
 		"needshomedir": "true",
 	},
-	RunE: func(cmd *cobra.Command, _ []string) error {
+	RunE: func(cmd *cobra.Command, origargs []string) error {
+		if len(origargs) == 0 && cmd.Flags().NFlag() == 0 {
+			return cmd.Usage()
+		}
 		ct, args := CmdArgs(cmd)
 		return instance.ForAll(ct, Hostname, unsetInstance, args, []string{})
 	},