summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2014-06-02 18:16:44 +0200
committerSamy Pessé <samypesse@gmail.com>2014-06-02 18:16:44 +0200
commit7dfcd102dd74ea58896a601b4c4322c3474e9767 (patch)
tree76a3fcf8fbfd2d336d0239f9eca8312007a20051 /lib
parenta91245d575a26bb3172b4bf453f8f6b2cbc187d2 (diff)
downloadgitbook-7dfcd102dd74ea58896a601b4c4322c3474e9767.zip
gitbook-7dfcd102dd74ea58896a601b4c4322c3474e9767.tar.gz
gitbook-7dfcd102dd74ea58896a601b4c4322c3474e9767.tar.bz2
Fix calcul of output format for ebook
Diffstat (limited to 'lib')
-rw-r--r--lib/generate/ebook/index.js9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/generate/ebook/index.js b/lib/generate/ebook/index.js
index 51afaeb..cec0909 100644
--- a/lib/generate/ebook/index.js
+++ b/lib/generate/ebook/index.js
@@ -15,11 +15,6 @@ var stringUtils = require("../../utils/string");
*/
var Generator = function() {
BaseGenerator.apply(this, arguments);
-
- // Options for eBook generation
- this.options = _.defaults(this.options, {
- extension: "epub"
- });
};
util.inherits(Generator, BaseGenerator);
@@ -29,7 +24,7 @@ Generator.prototype.finish = function() {
return BaseGenerator.prototype.finish.apply(this)
.then(function() {
var d = Q.defer();
- var format = that.options.extension || path.extname(that.options.output);
+ var format = that.options.extension || path.extname(that.options.output).replace("\.", "") || "pdf";
if (!that.options.cover && fs.existsSync(path.join(that.options.output, "cover.jpg"))) {
that.options.cover = path.join(that.options.output, "cover.jpg");
@@ -72,7 +67,7 @@ Generator.prototype.finish = function() {
var command = [
"ebook-convert",
path.join(that.options.output, "index.html"),
- path.join(that.options.output, "index."+that.options.extension),
+ path.join(that.options.output, "index."+format),
stringUtils.optionsToShellArgs(_options)
].join(" ");