diff options
| -rw-r--r-- | lib/sisu/v5/html_tune.rb | 3 | ||||
| -rw-r--r-- | lib/sisu/v5/manifest.rb | 1 | ||||
| -rw-r--r-- | lib/sisu/v5/qrcode.rb | 1 | ||||
| -rw-r--r-- | lib/sisu/v5/se_info_env.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v6/html_tune.rb | 3 | ||||
| -rw-r--r-- | lib/sisu/v6/manifest.rb | 1 | ||||
| -rw-r--r-- | lib/sisu/v6/qrcode.rb | 1 | ||||
| -rw-r--r-- | lib/sisu/v6/se_info_env.rb | 2 |
8 files changed, 8 insertions, 6 deletions
diff --git a/lib/sisu/v5/html_tune.rb b/lib/sisu/v5/html_tune.rb index 3e8c2d68..1ccd3cf2 100644 --- a/lib/sisu/v5/html_tune.rb +++ b/lib/sisu/v5/html_tune.rb @@ -129,9 +129,8 @@ module SiSU_HTML_Tune def initialize(data,md) @data,@md=data,md @vz=SiSU_Viz::Defaults.new - @env=SiSU_Env::InfoEnv.new(@md.fns) @sys=SiSU_Env::SystemCall.new - @env=SiSU_Env::InfoEnv.new(@md.fns) + @env=SiSU_Env::InfoEnv.new(@md.fns,@md) @brace_url=SiSU_Viz::Defaults.new.url_decoration end def songsheet diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb index 0b4f79a4..f19f8b38 100644 --- a/lib/sisu/v5/manifest.rb +++ b/lib/sisu/v5/manifest.rb @@ -189,6 +189,7 @@ module SiSU_Manifest sys.md5("#{pth}/#{file}") else end + dgst=dgst ? dgst : [ '', 'n/a' ] if (@md.opt.act[:verbose][:set]==:on \ || @md.opt.act[:verbose_plus][:set]==:on \ || @md.opt.act[:maintenance][:set]==:on) diff --git a/lib/sisu/v5/qrcode.rb b/lib/sisu/v5/qrcode.rb index 3a7d9406..448de004 100644 --- a/lib/sisu/v5/qrcode.rb +++ b/lib/sisu/v5/qrcode.rb @@ -189,6 +189,7 @@ WOK else (sys.sha256("#{pth}/#{file}")) end + dgst=dgst ? dgst : [ '', 'n/a' ] if (@md.opt.act[:verbose][:set]==:on \ || @md.opt.act[:verbose_plus][:set]==:on \ || @md.opt.act[:maintenance][:set]==:on) diff --git a/lib/sisu/v5/se_info_env.rb b/lib/sisu/v5/se_info_env.rb index 777644d7..c460195c 100644 --- a/lib/sisu/v5/se_info_env.rb +++ b/lib/sisu/v5/se_info_env.rb @@ -1785,7 +1785,7 @@ WOK path.image_source_include else if @@local_image==true - cmd=@selections.str ? @selections.str : '' + cmd=@md.opt.selections.str ? @md.opt.selections.str : '' SiSU_Screen::Ansi.new( cmd, "WARNING - no local image directory or images:", diff --git a/lib/sisu/v6/html_tune.rb b/lib/sisu/v6/html_tune.rb index d9245a30..10b5b964 100644 --- a/lib/sisu/v6/html_tune.rb +++ b/lib/sisu/v6/html_tune.rb @@ -129,9 +129,8 @@ module SiSU_HTML_Tune def initialize(data,md) @data,@md=data,md @vz=SiSU_Viz::Defaults.new - @env=SiSU_Env::InfoEnv.new(@md.fns) @sys=SiSU_Env::SystemCall.new - @env=SiSU_Env::InfoEnv.new(@md.fns) + @env=SiSU_Env::InfoEnv.new(@md.fns,@md) @brace_url=SiSU_Viz::Defaults.new.url_decoration end def songsheet diff --git a/lib/sisu/v6/manifest.rb b/lib/sisu/v6/manifest.rb index 6f22eefb..a0d4102f 100644 --- a/lib/sisu/v6/manifest.rb +++ b/lib/sisu/v6/manifest.rb @@ -189,6 +189,7 @@ module SiSU_Manifest sys.md5("#{pth}/#{file}") else end + dgst=dgst ? dgst : [ '', 'n/a' ] if (@md.opt.act[:verbose][:set]==:on \ || @md.opt.act[:verbose_plus][:set]==:on \ || @md.opt.act[:maintenance][:set]==:on) diff --git a/lib/sisu/v6/qrcode.rb b/lib/sisu/v6/qrcode.rb index aa31236c..4c752963 100644 --- a/lib/sisu/v6/qrcode.rb +++ b/lib/sisu/v6/qrcode.rb @@ -189,6 +189,7 @@ WOK else (sys.sha256("#{pth}/#{file}")) end + dgst=dgst ? dgst : [ '', 'n/a' ] if (@md.opt.act[:verbose][:set]==:on \ || @md.opt.act[:verbose_plus][:set]==:on \ || @md.opt.act[:maintenance][:set]==:on) diff --git a/lib/sisu/v6/se_info_env.rb b/lib/sisu/v6/se_info_env.rb index abd46542..76e0d17d 100644 --- a/lib/sisu/v6/se_info_env.rb +++ b/lib/sisu/v6/se_info_env.rb @@ -1785,7 +1785,7 @@ WOK path.image_source_include else if @@local_image==true - cmd=@selections.str ? @selections.str : '' + cmd=@md.opt.selections.str ? @md.opt.selections.str : '' SiSU_Screen::Ansi.new( cmd, "WARNING - no local image directory or images:", |