summaryrefslogtreecommitdiffstats
path: root/lib/generate
diff options
context:
space:
mode:
authorJuho Vepsalainen <bebraw@gmail.com>2014-06-03 17:59:26 +0300
committerJuho Vepsalainen <bebraw@gmail.com>2014-06-03 17:59:26 +0300
commitf0e18afec18eb2d6155fa3e9dc3c0ed7e3a38a89 (patch)
tree3b1fcd87631d7c935bb0748bf02440ce4d0857e5 /lib/generate
parentb6d11d88b78149ee0d235b4f7373caf21115c863 (diff)
downloadgitbook-f0e18afec18eb2d6155fa3e9dc3c0ed7e3a38a89.zip
gitbook-f0e18afec18eb2d6155fa3e9dc3c0ed7e3a38a89.tar.gz
gitbook-f0e18afec18eb2d6155fa3e9dc3c0ed7e3a38a89.tar.bz2
In case there's no config file, do not fail
Diffstat (limited to 'lib/generate')
-rw-r--r--lib/generate/index.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/generate/index.js b/lib/generate/index.js
index 1fb372e..adbcf26 100644
--- a/lib/generate/index.js
+++ b/lib/generate/index.js
@@ -93,11 +93,15 @@ var generate = function(options) {
// Read config file
.then(function() {
- var _config = require(path.resolve(options.input, options.configFile));
+ try {
+ var _config = require(path.resolve(options.input, options.configFile));
- _.extend(options, _.omit(_config, 'input', 'configFile', 'defaultsPlugins'));
-
- return Q();
+ _.extend(options, _.omit(_config, 'input', 'configFile', 'defaultsPlugins'));
+ }
+ catch(err) {
+ // No config file: not a big deal
+ return Q();
+ }
})
// Read readme