From 42ae2f18d8e712dce9d5b674f04a7551afe1a49c Mon Sep 17 00:00:00 2001 From: Keith Fahlgren Date: Tue, 21 Jul 2009 01:17:35 +0000 Subject: [PATCH] Corrected bugs caused by path and file assumptions were not met --- xsl/epub/bin/dbtoepub | 2 ++ xsl/epub/bin/lib/docbook.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xsl/epub/bin/dbtoepub b/xsl/epub/bin/dbtoepub index d864024e3..b9239d110 100755 --- a/xsl/epub/bin/dbtoepub +++ b/xsl/epub/bin/dbtoepub @@ -20,6 +20,7 @@ lib = File.expand_path(File.join(File.dirname(__FILE__), 'lib')) $LOAD_PATH.unshift(lib) if File.exist?(lib) +require 'fileutils' require 'optparse' require 'tmpdir' @@ -60,6 +61,7 @@ end db_files.each {|docbook_file| dir = File.expand_path(File.join(Dir.tmpdir, ".epubtmp#{Time.now.to_f.to_s}")) + FileUtils.mkdir_p(dir) e = DocBook::Epub.new(docbook_file, dir, css_file, customization_layer, otf_files) if output_file diff --git a/xsl/epub/bin/lib/docbook.rb b/xsl/epub/bin/lib/docbook.rb index 39627d0bd..2664999bb 100755 --- a/xsl/epub/bin/lib/docbook.rb +++ b/xsl/epub/bin/lib/docbook.rb @@ -115,8 +115,8 @@ module DocBook # were XIncluded or added by ENTITY # http://sourceforge.net/tracker/?func=detail&aid=2750442&group_id=21935&atid=373747 def collapse_docbook - collapsed_file = File.join(File.dirname(@docbook_file), - '.collapsed.' + File.basename(@docbook_file)) + collapsed_file = File.join(File.expand_path(File.dirname(@docbook_file)), + '.collapsed.' + File.basename(@docbook_file)) entity_collapse_command = "xmllint --loaddtd --noent -o '#{collapsed_file}' '#{@docbook_file}'" entity_success = system(entity_collapse_command) raise "Could not collapse named entites in #{@docbook_file}" unless entity_success -- 2.40.0