diff options
| author | Ralph Amissah <ralph@amissah.com> | 2015-04-21 13:21:29 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2015-04-25 13:46:03 -0400 |
| commit | 6b9144038374edc20f539f294578d10c1a5acdc5 (patch) | |
| tree | aad801cd35c30999fb4673275b4263efbaa103a7 | |
| parent | c: hub options, fix (diff) | |
c&d: se_info_env, program images path
| -rw-r--r-- | lib/sisu/current/se_info_env.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/develop/se_info_env.rb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/sisu/current/se_info_env.rb b/lib/sisu/current/se_info_env.rb index 268323d2..297a0a10 100644 --- a/lib/sisu/current/se_info_env.rb +++ b/lib/sisu/current/se_info_env.rb @@ -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}") diff --git a/lib/sisu/develop/se_info_env.rb b/lib/sisu/develop/se_info_env.rb index d22602d4..7cd4041b 100644 --- a/lib/sisu/develop/se_info_env.rb +++ b/lib/sisu/develop/se_info_env.rb @@ -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}") |