You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/10/25 19:11:06 UTC

[12/19] brooklyn-client git commit: Fix subcommand usage.

Fix subcommand usage.

avoid 'BROOKLYN_NAME' in help text


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/dca9a27e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/dca9a27e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/dca9a27e

Branch: refs/heads/master
Commit: dca9a27e1aa4e8885821d307fd48981223701409
Parents: 3808374
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Mon Oct 24 14:49:17 2016 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Mon Oct 24 14:49:17 2016 +0100

----------------------------------------------------------------------
 cli/app/app.go                 | 2 +-
 cli/commands/catalog-delete.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/dca9a27e/cli/app/app.go
----------------------------------------------------------------------
diff --git a/cli/app/app.go b/cli/app/app.go
index ad96fa3..07ef3cd 100644
--- a/cli/app/app.go
+++ b/cli/app/app.go
@@ -92,7 +92,7 @@ func getCommand(baseName string, metadata command_metadata.CommandMetadata, runn
 				Aliases:         operand.Aliases,
 				ShortName:       operand.ShortName,
 				Description:     operand.Description,
-				Usage:           operand.Usage,
+				Usage:           strings.Replace(operand.Usage, "BROOKLYN_NAME", baseName, -1),
 				Flags:           operand.Flags,
 				SkipFlagParsing: operand.SkipFlagParsing,
 				Action:          subCommandAction(command.Name, operand.Name, runner),

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/dca9a27e/cli/commands/catalog-delete.go
----------------------------------------------------------------------
diff --git a/cli/commands/catalog-delete.go b/cli/commands/catalog-delete.go
index 77bb078..8b6a33a 100644
--- a/cli/commands/catalog-delete.go
+++ b/cli/commands/catalog-delete.go
@@ -44,7 +44,7 @@ func (cmd *DeleteCatalogItem) Metadata() command_metadata.CommandMetadata {
 		Name:        "delete",
 		Description: "delete the given catalog item",
 		Usage:       "BROOKLYN_NAME catalog  " + deleteCommandName +
-			" TYPE [ITEM_ID:VERSION] (where TYPE is one of application, location, entity, policy, may be abbreviated)",
+			" TYPE ITEM_ID:VERSION (where TYPE is one of application, location, entity, policy, may be abbreviated)",
 	}
 }