aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2012-05-01 23:33:31 -0400
committerRalph Amissah <ralph@amissah.com>2012-05-01 23:33:31 -0400
commit714a14fcc16f4881779f3ea69fe6658560a26b66 (patch)
tree39257eb1a5386c194ccf9f67fe9b2fd3032e99db
parentv3: harvest (metadata, site/document summary) fixes (diff)
v3: misc, minor
-rw-r--r--lib/sisu/v3/composite.rb2
-rw-r--r--lib/sisu/v3/screen_text_color.rb2
-rw-r--r--lib/sisu/v3/sysenv.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/sisu/v3/composite.rb b/lib/sisu/v3/composite.rb
index 21adb030..ac64b15e 100644
--- a/lib/sisu/v3/composite.rb
+++ b/lib/sisu/v3/composite.rb
@@ -108,7 +108,7 @@ module SiSU_Assemble
end
def read
begin
- @fns_array=IO.readlines(@opt.fns,'')
+ @fns_array=IO.readlines(@opt.fno,'')
assembled=insertions?
write(assembled)
rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
diff --git a/lib/sisu/v3/screen_text_color.rb b/lib/sisu/v3/screen_text_color.rb
index 7705e3b1..5dd6109d 100644
--- a/lib/sisu/v3/screen_text_color.rb
+++ b/lib/sisu/v3/screen_text_color.rb
@@ -206,7 +206,7 @@ module SiSU_Screen
def sisu
end
def rescue
- puts %{\t #{@cX.orange}Rescued#{@cX.off} #{@cX.grey}#{yield if block_given?}\n\t An#{@cX.off} #{@cX.fuschia}ERROR#{@cX.off} #{@cX.grey}occurred, message:#{@cX.off} #{@cX.fuschia}#{@txt[0]}#{@cX.off} #{@cX.grey}#{@txt[1]}#{@cX.off} #{@cX.brown}#{@txt[2]}#{@cX.off}}
+ STDERR.puts %{\t #{@cX.orange}Rescued#{@cX.off} #{@cX.grey}#{yield if block_given?}\n\t An#{@cX.off} #{@cX.fuschia}ERROR#{@cX.off} #{@cX.grey}occurred, message:#{@cX.off} #{@cX.fuschia}#{@txt[0]}#{@cX.off} #{@cX.grey}#{@txt[1]}#{@cX.off} #{@cX.brown}#{@txt[2]}#{@cX.off}}
end
def warn
puts "\t #{@cX.brown}#{@txt[0]}#{@cX.off} #{@cX.grey}#{@txt[1]}#{@cX.off}"
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index 0439955b..09dd5d6e 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -4796,7 +4796,7 @@ WOK
elsif output_dir_structure.redirect?
@md.opt.opt_act[:redirect][:inst]
else
- "#{@env.path.webserv}"
+ @env.path.webserv
end
end
def base