From 7dfcd102dd74ea58896a601b4c4322c3474e9767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samy=20Pess=C3=A9?= <samypesse@gmail.com>
Date: Mon, 2 Jun 2014 18:16:44 +0200
Subject: [PATCH] Fix calcul of output format for ebook

---
 bin/gitbook.js              | 3 ---
 lib/generate/ebook/index.js | 9 ++-------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/bin/gitbook.js b/bin/gitbook.js
index c2c2e3190..208d2ea2a 100755
--- a/bin/gitbook.js
+++ b/bin/gitbook.js
@@ -83,10 +83,7 @@ build.command(prog.command('serve [source_dir]'))
 build.commandEbook(prog.command('ebook [source_dir]'))
 .description('Build a gitbook as a eBook (format detected according to the extension)')
 .action(function(dir, options) {
-    var ext = options.output ? path.extname(options.output) : "epub";
-
     build.file(dir, _.extend(options, {
-        extension: ext,
         format: "ebook"
     }));
 });
diff --git a/lib/generate/ebook/index.js b/lib/generate/ebook/index.js
index 51afaebe6..cec0909b8 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(" ");