Merge branch 'develop' of github.com:oauth-io/oauthd into develop

oauth-io · Oct 28, 2014 · 0aea5a0 · 0aea5a0
2 parents a8ad1df + 111a320
commit 0aea5a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,2 +1,2 @@
-lib
-Gruntfile.js
+/Gruntfile.js
+src
diff --git a/src/cli/plugins.coffee b/src/cli/plugins.coffee
@@ -321,7 +321,8 @@ module.exports = (args, options) ->
 
 		if args[0]?
 			console.log 'Unknown command: ' + args[0].yellow
-		@help()
+		if not options.help
+			@help()
 		return main_defer.promise