diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-05-17 18:12:11 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-05-17 18:12:11 -0400 |
commit | e28ee29ba60d6a97598eeb93d67ae36256c69697 (patch) | |
tree | 21243fcd58f773f38d0613dba47f2bf597953609 /lib/sisu/v3/odf.rb | |
parent | debian/changelog (3.0.8-1) (diff) | |
parent | v3: po4a re-enabled, related fixes (issues persist) (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/odf.rb')
-rw-r--r-- | lib/sisu/v3/odf.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v3/odf.rb index 81344d4c..a223600e 100644 --- a/lib/sisu/v3/odf.rb +++ b/lib/sisu/v3/odf.rb @@ -84,12 +84,12 @@ module SiSU_ODF @env.odf_structure unless @opt.cmd =~/q/ tool=(@opt.cmd =~/[MVv]/) \ - ? "#{@env.program.odf_viewer} file://#{@md.file.output_path.odt}/#{@md.file.base_filename.odt}" \ + ? "#{@env.program.odf_viewer} file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}" \ : @opt.fns @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'Opendocument (ODF:ODT)',tool).green_hi_blue \ : SiSU_Screen::Ansi.new(@opt.cmd,'Opendocument (ODF:ODT)',tool).green_title_hi - SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.odt}/#{@md.file.base_filename.odt}").flow if @opt.cmd =~/[MV]/ + SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}").flow if @opt.cmd =~/[MV]/ end SiSU_ODF::Source::Scroll.new(@particulars).songsheet SiSU_Env::Info_skin.new(@md).select @@ -699,7 +699,7 @@ module SiSU_ODF env=SiSU_Env::SiSU_file.new(@md) env.mkdir env.make_path(@env.processing_path.odt) - env.make_path(@md.file.output_path.odt) + env.make_path(@md.file.output_path.odt.dir) filename="#{@env.processing_path.odt}/content.xml" od=File.new(filename,'w+') @content.each do |para| # this is a hack @@ -707,11 +707,11 @@ module SiSU_ODF end od.close opendoc=@md.fn[:odf] - mkdir_p(@md.file.output_path.odt) unless FileTest.directory?(@md.file.output_path.odt) + mkdir_p(@md.file.output_path.odt.dir) unless FileTest.directory?(@md.file.output_path.odt.dir) system(" cd #{@env.processing_path.odf} zip -qr #{opendoc} * - mv #{opendoc} #{@md.file.place_file.odt} + mv #{opendoc} #{@md.file.place_file.odt.dir} cd #{Dir.pwd} ") end |