From f63736fe14e9219271edd85a2ad5d58887bb7e5f Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Sat, 21 Feb 2015 17:29:46 -0800
Subject: [PATCH] remove redundant Help field from Cmd struct

---
 cmd/warren/cmd_build.go   | 3 +--
 cmd/warren/cmd_deploy.go  | 3 +--
 cmd/warren/cmd_version.go | 1 -
 cmd/warren/cmd_warrend.go | 2 --
 cmd/warrend/cmd_reg.go    | 3 +--
 cmd/warrend/cmd_status.go | 3 +--
 lib/warren/cmd.go         | 8 +++-----
 7 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/cmd/warren/cmd_build.go b/cmd/warren/cmd_build.go
index fb46a22..f420a14 100644
--- a/cmd/warren/cmd_build.go
+++ b/cmd/warren/cmd_build.go
@@ -21,14 +21,13 @@ var buildCmd = &warren.Command{
 	Name:    "build",
 	Usage:   buildUsage,
 	Summary: "build the go server in the current directory",
-	Help:    buildUsage,
 	Run:     buildRun,
 }
 
 func buildRun(cmd *warren.Command, args ...string) {
 
 	if len(args) > 0 && args[0] == "help" {
-		fmt.Print(cmd.Help)
+		fmt.Print(cmd.Usage)
 		return
 	}
 
diff --git a/cmd/warren/cmd_deploy.go b/cmd/warren/cmd_deploy.go
index 2eb5ce5..8314c1a 100644
--- a/cmd/warren/cmd_deploy.go
+++ b/cmd/warren/cmd_deploy.go
@@ -15,7 +15,6 @@ var deployCmd = &warren.Command{
 	Name:    "deploy",
 	Usage:   deployUsage,
 	Summary: "deploy the go server and support files",
-	Help:    deployUsage,
 	Run:     deployRun,
 }
 
@@ -45,7 +44,7 @@ func cp(dst, src string) error {
 
 func deployRun(cmd *warren.Command, args ...string) {
 	if len(args) > 0 && args[0] == "help" {
-		fmt.Print(cmd.Help)
+		fmt.Print(cmd.Usage)
 		return
 	}
 	dst := checkDeployDir()
diff --git a/cmd/warren/cmd_version.go b/cmd/warren/cmd_version.go
index d844245..60c110a 100644
--- a/cmd/warren/cmd_version.go
+++ b/cmd/warren/cmd_version.go
@@ -13,7 +13,6 @@ var versionCmd = &warren.Command{
 	Name:    "version",
 	Usage:   versionUsage,
 	Summary: "prints the current version",
-	Help:    versionUsage,
 	Run:     versionRun,
 }
 
diff --git a/cmd/warren/cmd_warrend.go b/cmd/warren/cmd_warrend.go
index eed1f20..1627049 100644
--- a/cmd/warren/cmd_warrend.go
+++ b/cmd/warren/cmd_warrend.go
@@ -18,7 +18,6 @@ var regCmd = &warren.Command{
 	Name:    "reg",
 	Usage:   regUsage,
 	Summary: "Register a deployment directory for running",
-	Help:    regUsage,
 	Run:     warrendRun,
 }
 
@@ -29,7 +28,6 @@ var statusCmd = &warren.Command{
 	Name:    "status",
 	Usage:   statusUsage,
 	Summary: "Get the status from the warrend server",
-	Help:    statusUsage,
 	Run:     warrendRun,
 }
 
diff --git a/cmd/warrend/cmd_reg.go b/cmd/warrend/cmd_reg.go
index 0c1e62a..e98d1fe 100644
--- a/cmd/warrend/cmd_reg.go
+++ b/cmd/warrend/cmd_reg.go
@@ -16,7 +16,6 @@ var regCmd = &SockCommand{
 		Name:    "reg",
 		Usage:   regUsage,
 		Summary: "Register a deployment directory for running",
-		Help:    regUsage,
 	},
 	Run: regRun,
 }
@@ -24,7 +23,7 @@ var regCmd = &SockCommand{
 // reg path [nickname]
 func regRun(cmd *SockCommand, c net.Conn, path string, args ...string) {
 	if (len(args) > 0 && args[0] == "help") || len(args) < 1 {
-		warren.WriteStringz(c, cmd.Help)
+		warren.WriteStringz(c, cmd.Usage)
 		return
 	}
 
diff --git a/cmd/warrend/cmd_status.go b/cmd/warrend/cmd_status.go
index de5e754..e045a55 100644
--- a/cmd/warrend/cmd_status.go
+++ b/cmd/warrend/cmd_status.go
@@ -15,14 +15,13 @@ var statusCmd = &SockCommand{
 		Name:    "status",
 		Usage:   statusUsage,
 		Summary: "Print status of warrend",
-		Help:    statusUsage,
 	},
 	Run: statusRun,
 }
 
 func statusRun(cmd *SockCommand, c net.Conn, path string, args ...string) {
 	if len(args) > 0 && args[0] == "help" {
-		warren.WriteStringz(c, cmd.Help)
+		warren.WriteStringz(c, cmd.Usage)
 		return
 	}
 
diff --git a/lib/warren/cmd.go b/lib/warren/cmd.go
index 9610a0f..12daa5b 100644
--- a/lib/warren/cmd.go
+++ b/lib/warren/cmd.go
@@ -20,11 +20,9 @@ type Command struct {
 	Run  func(cmd *Command, args ...string)
 	Flag flag.FlagSet
 
-	Name  string
-	Usage string
-
-	Summary string
-	Help    string
+	Name    string
+	Usage   string // multiline doc about using cmd
+	Summary string // one line info about cmd
 }
 
 func (c *Command) GetName() string {