diff options
Diffstat (limited to 'lib/sisu/v3/manifest.rb')
-rw-r--r-- | lib/sisu/v3/manifest.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sisu/v3/manifest.rb b/lib/sisu/v3/manifest.rb index c496c8a6..38dc994c 100644 --- a/lib/sisu/v3/manifest.rb +++ b/lib/sisu/v3/manifest.rb @@ -138,7 +138,7 @@ module SiSU_Manifest dgst =if @dg =~/^sha(?:2|256)$/; sys.sha256("#{pth}/#{file}") else sys.md5("#{pth}/#{file}") end - SiSU_Screen::Ansi.new(@md.cmd,"#{dgst[1]} #{file}").warn if @md.cmd =~/[vVM]/ + SiSU_Screen::Ansi.new(@md.opt.cmd,"#{dgst[1]} #{file}").warn if @md.opt.cmd =~/[vVM]/ size=(File.size("#{pth}/#{file}")/1024.00).to_s kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1] @manifest[:txt] << "#{file} #{id} #{kb}\n" @@ -285,10 +285,10 @@ module SiSU_Manifest summarize(id,file,pth) end if FileTest.file?(@md.file.place_file.txt)==true - if @md.cmd =~/a/; id='Plaintext (Unix (UTF-8) with footnotes)' - elsif @md.cmd =~/e/; id='Plaintext (Unix (UTF-8) with endnotes)' - elsif @md.cmd =~/A/; id='Plaintext (dos (UTF-8) with footnotes)' - elsif @md.cmd =~/E/; id='Plaintext (dos (UTF-8) with endnotes)' + if @md.opt.cmd =~/a/; id='Plaintext (Unix (UTF-8) with footnotes)' + elsif @md.opt.cmd =~/e/; id='Plaintext (Unix (UTF-8) with endnotes)' + elsif @md.opt.cmd =~/A/; id='Plaintext (dos (UTF-8) with footnotes)' + elsif @md.opt.cmd =~/E/; id='Plaintext (dos (UTF-8) with endnotes)' else id='Plaintext (UTF-8)' end pth=@md.file.output_path.txt @@ -728,7 +728,7 @@ WOK </html> WOK output - rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error + rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error ensure end end |