diff options
author | Ralph Amissah <ralph@amissah.com> | 2012-04-05 14:50:11 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2012-04-05 14:50:11 -0400 |
commit | be4009ac43cf1fac13f7879ee76f67eaf52a8dcd (patch) | |
tree | 57bc0a23cbf54d32ad822d76471aa11ec704b8b4 /lib/sisu/v3/sysenv.rb | |
parent | debian/changelog (3.2.1-1) (diff) | |
parent | v3: sql creation -v reporting reduced (diff) |
Merge tag 'sisu_3.2.2' into debian/sid
Diffstat (limited to 'lib/sisu/v3/sysenv.rb')
-rw-r--r-- | lib/sisu/v3/sysenv.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index 4383a893..442795c9 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -590,6 +590,7 @@ module SiSU_Env odf: filename(code,'','.odt'), epub: filename(code,'','.epub'), plain: filename(code,'','.txt'), + qrcode: filename(code,'','.jpg'), manpage: filename(code,'','.1'), #fix, section number wiki: filename(code,'wiki','.txt'), digest: filename(code,'digest','.txt'), @@ -848,7 +849,7 @@ module SiSU_Env elsif @cmd =~/V/; FileUtils::rm(@input) elsif @cmd !~/q/; FileUtils::rm(@input) elsif @cmd =~/q/; FileUtils::rm(@input) - else puts "\tWARN: operation ignored" + else puts "\tWARN: operation ignored" end end end @@ -1852,10 +1853,11 @@ WOK defaults[:sisu_share] end def style - if (@md.opt.opt_act[:dump][:bool] \ - && @md.opt.opt_act[:dump][:inst]) \ - || (@md.opt.opt_act[:redirect][:bool] \ - && @md.opt.opt_act[:redirect][:inst]) + if @md \ + && ((@md.opt.opt_act[:dump][:bool] \ + && @md.opt.opt_act[:dump][:inst]) \ + || (@md.opt.opt_act[:redirect][:bool] \ + && @md.opt.opt_act[:redirect][:inst])) 'css' else defaults[:stylesheet_stub] |