summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2015-04-21 17:21:29 +0000
committerRalph Amissah <ralph@amissah.com>2015-04-25 17:46:03 +0000
commit6b9144038374edc20f539f294578d10c1a5acdc5 (patch)
treeaad801cd35c30999fb4673275b4263efbaa103a7 /lib
parentc: hub options, fix (diff)
downloadsisu-6b9144038374edc20f539f294578d10c1a5acdc5.zip
sisu-6b9144038374edc20f539f294578d10c1a5acdc5.tar.xz
c&d: se_info_env, program images path
Diffstat (limited to 'lib')
-rw-r--r--lib/sisu/current/se_info_env.rb4
-rw-r--r--lib/sisu/develop/se_info_env.rb4
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 268323d..297a0a1 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 d22602d..7cd4041 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}")