diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 4 | ||||
| -rw-r--r-- | lib/sisu/v3/options.rb | 10 | ||||
| -rw-r--r-- | lib/sisu/v3/urls.rb | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index c0d54f47..60240fe0 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -21,6 +21,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.7.orig.tar.xz sisu_3.2.7-1.dsc sisu_3.2.7-1.debian.tar.gz +* v3: qrcode, fixes + * ensure manifest is run + * urls fix + * v3: rescue & error warnings, some touched %% 3.2.6.orig.tar.xz (2012-05-01:18/2) diff --git a/lib/sisu/v3/options.rb b/lib/sisu/v3/options.rb index 0876604d..0af13902 100644 --- a/lib/sisu/v3/options.rb +++ b/lib/sisu/v3/options.rb @@ -397,14 +397,14 @@ module SiSU_Commandline end extra='' if cmd !~/[mn]/ - extra+=if cmd =~/[abegHhIiNOoPpTtwXxyz]/ \ + extra+=if cmd =~/[abegHhIiNOoPpQTtwXxyz]/ \ and cmd !~/[mn]/ 'm' #% add dal elsif ((cmd =~/[Dd]/ \ or (mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/)) \ and mod.inspect !~/(?:remove|(?:(?:re)?create(?:all)?|dropall|drop)$)/) \ and cmd !~/[mn]/ - 'm' #% add dal + 'm' #% add dal else '' end end @@ -416,14 +416,14 @@ module SiSU_Commandline end end if cmd !~/y/ - extra+=if cmd =~/[abeHhIiNopsSstwXxz]/ \ + extra+=if cmd =~/[abeHhIiNopQsSstwXxz]/ \ and cmd !~/y/ - 'ym' #% add manifest + 'ym' #% add manifest elsif (cmd =~/[Dd]/ \ or mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/) \ and files[0] !~/^remove$/ \ and cmd !~/y/ - 'ym' #% add manifest + 'ym' #% add manifest else '' end end diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb index 78650a42..d68334e2 100644 --- a/lib/sisu/v3/urls.rb +++ b/lib/sisu/v3/urls.rb @@ -165,14 +165,14 @@ module SiSU_Urls def concordance(x) SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}").result end - def qrcode(x) - SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}").result - end def manifest(x) SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}").result end self end + def qrcode(x) + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}").result + end def odt(x) SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.odf_viewer} file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}").result end |