diff options
Diffstat (limited to 'lib/generate')
| -rw-r--r-- | lib/generate/index.js | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/generate/index.js b/lib/generate/index.js index 520981c..1fb372e 100644 --- a/lib/generate/index.js +++ b/lib/generate/index.js @@ -54,7 +54,7 @@ var generate = function(options) { "output": null, // Config file (relative to input) - "configFile": "book.json", + "configFile": "book", // Output generator "generator": "site", @@ -93,17 +93,11 @@ var generate = function(options) { // Read config file .then(function() { - return fs.readFile(path.resolve(options.input, options.configFile)) - .then(function(_config) { - // Extend current config - _config = JSON.parse(_config); - _config = _.omit(_config, 'input', 'configFile', 'defaultsPlugins'); - - _.extend(options, _config); - }, function() { - // No config file: not a big deal - return Q(); - }); + var _config = require(path.resolve(options.input, options.configFile)); + + _.extend(options, _.omit(_config, 'input', 'configFile', 'defaultsPlugins')); + + return Q(); }) // Read readme |