CTAN sync 202110010301

1 files changed, 10 insertions, 7 deletions

diff --git a/support/tex4ebook/tex4ebook-exec_azw.lua b/support/tex4ebook/tex4ebook-exec_azw.lua
index 397292b648..ebf8d34144 100644
--- a/support/tex4ebook/tex4ebook-exec_azw.lua
+++ b/support/tex4ebook/tex4ebook-exec_azw.lua
@@ -1,5 +1,6 @@
 module(...,package.seeall)
 local eb = require("tex4ebook-exec_epub")
+local mobi = require("tex4ebook-exec_mobi")
 local ebookutils = require("mkutils")
 local log = logging.new "exec_azw"
 
@@ -19,13 +20,15 @@ function writeContainer()
   -- find the azw filename 
   local azwfile = eb.outputfile:gsub("epub$", "azw")
   local azwdist = eb.destdir ..  azwfile
-  local command = "kindlegen " .. epubpath .. " -o " .. azwfile
-	log:info("Pack azw ".. command)
-  local status, output = ebookutils.execute(command)
-  -- copy the azw file to the destination directory
-  -- the destination directory will be created by the epub writer, so it is possible to use
-  -- the cp function which doesn't try to create directory
-  ebookutils.cp(eb.basedir .. "/" .. azwfile, azwdist)
+  local status = mobi.kindlegen(epubpath, azwfile)
+  if status then
+    -- copy the azw file to the destination directory
+    -- the destination directory will be created by the epub writer, so it is possible to use
+    -- the cp function which doesn't try to create directory
+    if azwfile ~= azwdist then
+      ebookutils.cp(azwfile, azwdist)
+    end
+  end
 
 	return ret
 end