c&d: se_info_env, program images path
authorRalph Amissah <ralph@amissah.com>
Tue, 21 Apr 2015 17:21:29 +0000 (13:21 -0400)
committerRalph Amissah <ralph@amissah.com>
Sat, 25 Apr 2015 17:46:03 +0000 (13:46 -0400)
lib/sisu/current/se_info_env.rb
lib/sisu/develop/se_info_env.rb

index 268323d2dcbb0a11617f69a9e6fa9d0f40a18139..297a0a10c8d05a3316290f7ac71f0c88430d4021 100644 (file)
@@ -1483,7 +1483,9 @@ WOK
       def epub_cp_images(md)
         pth="#{processing_path.epub}/#{Ep[:d_oebps]}/image"
         FileUtils::mkdir_p(pth) unless FileTest.directory?(pth)
-        src="#{md.opt.sisu_data_dir?}/image"
+        src=(md.opt.sisu_install_type? == :full_path_to_sisu_bin_in_sisu_dir_tree) \
+        ? "#{md.opt.sisu_data_dir?}/image"
+        : "#{md.opt.sisu_data_dir?}/sisu/image"
         images=%W[bullet_09.png arrow_next_red.png arrow_prev_red.png arrow_up_red.png]
         images.each do |i| #move to avoid repeated tests
           if FileTest.file?("#{src}/#{i}")
index d22602d4f7b8c2af5a32c1434ee48ed8aea5cec6..7cd4041b94955fa693c4a1ecc9485af45c284dec 100644 (file)
@@ -1489,7 +1489,9 @@ WOK
       def epub_cp_images(md)
         pth="#{processing_path.epub}/#{Ep[:d_oebps]}/image"
         FileUtils::mkdir_p(pth) unless FileTest.directory?(pth)
-        src="#{md.opt.sisu_data_dir?}/image"
+        src=(md.opt.sisu_install_type? == :full_path_to_sisu_bin_in_sisu_dir_tree) \
+        ? "#{md.opt.sisu_data_dir?}/image"
+        : "#{md.opt.sisu_data_dir?}/sisu/image"
         images=%W[bullet_09.png arrow_next_red.png arrow_prev_red.png arrow_up_red.png]
         images.each do |i| #move to avoid repeated tests
           if FileTest.file?("#{src}/#{i}")