summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-09-02 03:15:14 +0000
committerRalph Amissah <ralph@amissah.com>2014-09-02 03:15:14 +0000
commit48ed4030f41a9cc1c5534373dd7870eb6c93c726 (patch)
tree8320c2bdea6adae3f5e093963f74c6570f41ec6f
parentv5 v6: cgi_sqlite, expansion of variable (default db name), double quotes, fix (diff)
downloadsisu-48ed4030f41a9cc1c5534373dd7870eb6c93c726.zip
sisu-48ed4030f41a9cc1c5534373dd7870eb6c93c726.tar.xz
v5 v6: misc, for when external dependencies unmet
-rw-r--r--lib/sisu/v5/html_tune.rb3
-rw-r--r--lib/sisu/v5/manifest.rb1
-rw-r--r--lib/sisu/v5/qrcode.rb1
-rw-r--r--lib/sisu/v5/se_info_env.rb2
-rw-r--r--lib/sisu/v6/html_tune.rb3
-rw-r--r--lib/sisu/v6/manifest.rb1
-rw-r--r--lib/sisu/v6/qrcode.rb1
-rw-r--r--lib/sisu/v6/se_info_env.rb2
8 files changed, 8 insertions, 6 deletions
diff --git a/lib/sisu/v5/html_tune.rb b/lib/sisu/v5/html_tune.rb
index 3e8c2d6..1ccd3cf 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 0b4f79a..f19f8b3 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 3a7d940..448de00 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 777644d..c460195 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 d9245a3..10b5b96 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 6f22eef..a0d4102 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 aa31236..4c75296 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 abd4654..76e0d17 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:",