From 630e6dea119edfb8997c9735f85aaeadb5976303 Mon Sep 17 00:00:00 2001
From: shkuropat <e.shkuropat@gmail.com>
Date: Tue, 15 May 2012 16:07:16 +0400
Subject: [PATCH] Fixed double 'usage' in sub-command help

---
 lib/help/formatter.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/help/formatter.js b/lib/help/formatter.js
index 8ae521c..717738d 100644
--- a/lib/help/formatter.js
+++ b/lib/help/formatter.js
@@ -260,7 +260,10 @@ HelpFormatter.prototype._joinParts = function (partStrings) {
 };
 
 HelpFormatter.prototype._formatUsage = function (usage, actions, groups, prefix) {
-  prefix = prefix || 'usage: ';
+  if (!prefix && !_.isString(prefix)) {
+      prefix = 'usage: ';
+  }
+
   actions = actions || [];
   groups = groups || [];
 
@@ -674,7 +677,7 @@ HelpFormatter.prototype._expandHelp = function (action) {
 
   for (actionProperty in action) {
     if (action.hasOwnProperty(actionProperty)) {
-      actionValue = params[actionProperty];
+      actionValue = action[actionProperty];
 
       if (actionValue !== $$.SUPPRESS) {
         params[actionProperty] = actionValue;