diff options
| -rw-r--r-- | lib/book.js | 5 | ||||
| -rw-r--r-- | lib/configuration.js | 2 | ||||
| -rw-r--r-- | lib/generator.js | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/lib/book.js b/lib/book.js index 96ceb06..a95113d 100644 --- a/lib/book.js +++ b/lib/book.js @@ -646,6 +646,11 @@ Book.prototype.parentRoot = function() { return this.root; }; +// Return true if it's a sub-book +Book.prototype.isSubBook = function() { + return !!this.parent; +}; + // Resolve a path in book Book.prototype.resolve = function(p) { return path.resolve(this.root, p); diff --git a/lib/configuration.js b/lib/configuration.js index a7b4f1f..f60dc83 100644 --- a/lib/configuration.js +++ b/lib/configuration.js @@ -107,6 +107,8 @@ Configuration.prototype.load = function() { if (that.options.gitbook == "*") { that.book.log.warn.ln("you should specify a gitbook version to use in your book.json, for example: "+(_.first(pkg.version.split("."))+".x.x")); } + + that.options.gitbook = pkg.version; }); }; diff --git a/lib/generator.js b/lib/generator.js index 6557461..f7f319d 100644 --- a/lib/generator.js +++ b/lib/generator.js @@ -58,7 +58,7 @@ BaseGenerator.prototype.copyCover = function() { ]) .fail(function() { // If orignaly from multi-lang, try copy from parent - if (!that.isMultilingual()) return; + if (!that.book.isSubBook()) return; return Q.all([ fs.copy(path.join(that.book.parentRoot(), "cover.jpg"), path.join(that.options.output, "cover.jpg")), |