diff options
| author | Samy Pessé <samypesse@gmail.com> | 2015-09-15 09:37:43 +0200 |
|---|---|---|
| committer | Samy Pessé <samypesse@gmail.com> | 2015-09-15 09:37:43 +0200 |
| commit | cceebb4fd979f4acc152de614fedab218de6c8a8 (patch) | |
| tree | e8c74c3c7cace90d2b9fa152f7217d15e5827c5e /lib/configuration.js | |
| parent | afd5465a6129e96bce62dab26a4ee41e7af7365c (diff) | |
| parent | d699dff872a36b33719385ddf8b641afdc5bada1 (diff) | |
| download | gitbook-cceebb4fd979f4acc152de614fedab218de6c8a8.zip gitbook-cceebb4fd979f4acc152de614fedab218de6c8a8.tar.gz gitbook-cceebb4fd979f4acc152de614fedab218de6c8a8.tar.bz2 | |
Merge branch 'improve/template-blocks'
Diffstat (limited to 'lib/configuration.js')
| -rw-r--r-- | lib/configuration.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/configuration.js b/lib/configuration.js index 3a73c10..acff1c1 100644 --- a/lib/configuration.js +++ b/lib/configuration.js @@ -100,7 +100,7 @@ Configuration.prototype.load = function() { try { configPath = require.resolve( - path.resolve(that.book.root, that.options.configFile) + that.book.resolve(that.options.configFile) ); // Invalidate node.js cache for livreloading @@ -125,7 +125,7 @@ Configuration.prototype.load = function() { that.book.log.warn.ln("gitbook version specified in your book.json might be too strict for future patches, \""+(_.first(pkg.version.split("."))+".x.x")+"\" is more adequate"); } - that.options.output = path.resolve(that.options.output || path.join(that.book.root, "_book")); + that.options.output = path.resolve(that.options.output || that.book.resolve("_book")); that.options.plugins = normalizePluginsList(that.options.plugins); that.options.defaultsPlugins = normalizePluginsList(that.options.defaultsPlugins || ""); that.options.plugins = _.union(that.options.plugins, that.options.defaultsPlugins); |