Merge remote-tracking branch 'upstream/master' into ref_links

1 files changed, 13 insertions, 8 deletions

diff --git a/bin/gitbook.js b/bin/gitbook.js
index c5a51a4..b868925 100755
--- a/bin/gitbook.js
+++ b/bin/gitbook.js
@@ -80,24 +80,29 @@ build.command(prog.command('serve [source_dir]'))
     generate();
 });
 
-build.command(prog.command('pdf [source_dir]'))
+build.commandEbook(prog.command('pdf [source_dir]'))
 .description('Build a gitbook as a PDF')
-.option('-pf, --paperformat <format>', 'PDF paper format (default is A4): "5in*7.5in", "10cm*20cm", "A4", "Letter"')
 .action(function(dir, options) {
     build.file(dir, _.extend(options, {
         extension: "pdf",
-        format: "pdf"
+        format: "ebook"
     }));
 });
 
-build.command(prog.command('ebook [source_dir]'))
-.description('Build a gitbook as a eBook')
-.option('-c, --cover <path>', 'Cover image, default is cover.jpg if exists')
+build.commandEbook(prog.command('epub [source_dir]'))
+.description('Build a gitbook as a ePub book')
 .action(function(dir, options) {
-    var ext = options.output ? path.extname(options.output) : "epub";
+    build.file(dir, _.extend(options, {
+        extension: "epub",
+        format: "ebook"
+    }));
+});
 
+build.commandEbook(prog.command('mobi [source_dir]'))
+.description('Build a gitbook as a Mobi book')
+.action(function(dir, options) {
     build.file(dir, _.extend(options, {
-        extension: ext,
+        extension: "mobi",
         format: "ebook"
     }));
 });