REverted change to bin/sails.js

campbellanderson · Feb 13, 2014 · 1ce1efe · 1ce1efe
1 parent 824664c
commit 1ce1efe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/bin/sails-generate.js b/bin/sails-generate.js
@@ -22,7 +22,7 @@ var package = require('../package.json')
  * Internally, uses ejs for rendering the various module templates.
  */
 
-module.exports = function ( program ) {
+module.exports = function ( ) {
 
 	// Build initial scope
 	var scope = {
@@ -40,18 +40,19 @@ module.exports = function ( program ) {
 
 
 	// Get command-line arguments
+	// from the arguments to this function
 	var cliArguments = Array.prototype.slice.call(arguments);
 
 	// Remove commander's extra argument
-	cliArguments.pop();
+	var commanderCmd = cliArguments.pop();
 
 	// Peel off the generatorType and the rest of the args
 	scope.generatorType = cliArguments.shift();
 	scope.args = cliArguments;
 
 	// Show usage if no generator type is defined
 	if (!scope.generatorType) {
-		program.usageMinusWildcard();
+		commanderCmd.usageMinusWildcard();
 		return;
 	}
 

diff --git a/bin/sails.js b/bin/sails.js
@@ -76,9 +76,7 @@ cmd = program.command('generate [something]');
 cmd.unknownOption = NOOP;
 cmd.description('');
 cmd.usage('[something]');
-cmd.action( function () {
-	require('./sails-generate')(cmd);
-});
+cmd.action( require('./sails-generate') );