summaryrefslogtreecommitdiffstats
path: root/lib/configuration.js
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2015-01-19 13:22:34 +0100
committerSamy Pessé <samypesse@gmail.com>2015-01-19 13:22:34 +0100
commit8ed9f645fc7bd7e79290dcf7c855df33d3cda262 (patch)
treefbe80af8c02b15c928327cd4f6e347bab29e8c77 /lib/configuration.js
parent60993d3123ef81f72e028dd496f26d3bbba0eec0 (diff)
downloadgitbook-8ed9f645fc7bd7e79290dcf7c855df33d3cda262.zip
gitbook-8ed9f645fc7bd7e79290dcf7c855df33d3cda262.tar.gz
gitbook-8ed9f645fc7bd7e79290dcf7c855df33d3cda262.tar.bz2
Fix parsing of langs
Add command to build
Diffstat (limited to 'lib/configuration.js')
-rw-r--r--lib/configuration.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/configuration.js b/lib/configuration.js
index 82bf010..2b470c4 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -16,10 +16,10 @@ Configuration.prototype.load = function() {
return Q()
.then(function() {
try {
- var _config = require(path.resolve(that.book.root, that.options.));
+ var _config = require(path.resolve(that.book.root, that.options.configFile));
that.options = _.merge(
that.options,
- _.omit(_config, 'input', 'configFile', 'defaultsPlugins', 'generator')
+ _.omit(_config, 'configFile', 'defaultsPlugins', 'generator', 'extension')
);
}
catch(err) {