diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-02-16 18:11:35 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-02-16 18:11:35 -0500 |
| commit | 4f364a330d70715125ada9a3818ce9575be6db38 (patch) | |
| tree | c3ce9e651014dfff1610a23510527ceadb10eea0 /lib/sisu/v3/epub.rb | |
| parent | debian/changelog 3.0.0-1 (diff) | |
| parent | changelogs, gitweb urls: debian release tags (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/epub.rb')
| -rw-r--r-- | lib/sisu/v3/epub.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/sisu/v3/epub.rb b/lib/sisu/v3/epub.rb index 0da90712..22c42980 100644 --- a/lib/sisu/v3/epub.rb +++ b/lib/sisu/v3/epub.rb @@ -85,14 +85,13 @@ module SiSU_EPUB @env=@particulars.env loc=@env.path.url.output_tell unless @opt.cmd =~/q/ - tool=if @opt.cmd =~/z/; "#{@env.program.epub_viewer} #{loc}/epub/#{@fnb}.epub" - elsif @opt.cmd =~/[MVv]/; "#{@env.program.epub_viewer} #{loc}/epub/#{@fnb}.epub" + tool=if @opt.cmd =~/[MVvz]/; "#{@env.program.epub_viewer} #{@md.file.output_path.epub}/#{@md.file.base_filename.epub}" else @opt.fns end @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'EPUB',tool).green_hi_blue \ : SiSU_Screen::Ansi.new(@opt.cmd,'EPUB',tool).green_title_hi - SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{loc}/epub/#{@fnb}.epub").flow if @opt.cmd =~/[MV]/ + SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.file.output_path.epub}/#{@md.file.base_filename.epub}").flow if @opt.cmd =~/[MV]/ end @env.path.epub_bld #(@md) @env.path.epub_cp_images(@md) |