不要怂,就是干,撸起袖子干!

Commit 55646787 by Daniel Cohen

changed options to cli-options due to conflict with commander npm

1 parent 7a3b7196
Showing with 4 additions and 3 deletions
...@@ -181,13 +181,13 @@ program ...@@ -181,13 +181,13 @@ program
.option('-c, --create-migration [migration-name]', 'Creates a new migration.') .option('-c, --create-migration [migration-name]', 'Creates a new migration.')
.option('-p, --migrations-path', 'migration directory path.') .option('-p, --migrations-path', 'migration directory path.')
.option('-U, --url <url>', 'Database url. An alternative to a config file') .option('-U, --url <url>', 'Database url. An alternative to a config file')
.option('-o,--cli-options <options_file>', 'Specifies lib options from file.')
.option('--config <config_file>', 'Specifies alternate config file.') .option('--config <config_file>', 'Specifies alternate config file.')
.option('--options <options_file>', 'Specifies lib options from file.')
.option('--coffee', 'Consider coffee script files as migration source.') .option('--coffee', 'Consider coffee script files as migration source.')
.parse(process.argv) .parse(process.argv)
if(typeof program.options === 'string') { if(typeof program.cliOptions === 'string') {
loadDefaultOptions(program.options); loadDefaultOptions(program.cliOptions);
} }
if(typeof program.config === 'string') { if(typeof program.config === 'string') {
...@@ -348,3 +348,4 @@ if (program.migrate || program.undo) { ...@@ -348,3 +348,4 @@ if (program.migrate || program.undo) {
} else { } else {
console.log('No action specified. Try "sequelize --help" for usage information.') console.log('No action specified. Try "sequelize --help" for usage information.')
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!