aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--lib/sisu/v2/dal.rb16
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/sisu/v2/dal.rb b/lib/sisu/v2/dal.rb
index 04363498..6fd23b60 100644
--- a/lib/sisu/v2/dal.rb
+++ b/lib/sisu/v2/dal.rb
@@ -210,8 +210,6 @@ module SiSU_DAL
protected
def create_dal
dal_array=[]
- tell=SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction')
- tell.green_title_hi unless @opt.cmd =~/q/
file_array=@env.read_source_file(@opt.fns)
file_array.each do |l|
if l =~/\r\n/; l.gsub!(/\r\n/,"\n")
@@ -220,11 +218,19 @@ module SiSU_DAL
meta=file_array.dup
meta=meta.join.split("\n\n") #check whether can be eliminated, some of these are large objects to have twice
@md=SiSU_Param::Parameters::Instructions.new(meta,@opt).extract
+ unless @opt.cmd =~/q/
+ tell=(@md.cmd=~/[vVM]/) \
+ ? SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction') \
+ : SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction',@md.fns)
+ tell.green_title_hi
+ end
meta=nil
dal=SiSU_DAL::Make.new(@md,file_array).song
- SiSU_Screen::Ansi.new(@md.cmd,@md.fns,"~meta/#{@md.fns}.meta").output if @md.cmd =~/v/
- tell=SiSU_Screen::Ansi.new(@md.cmd,"dal -> #{@make_fns.meta}") if @md.cmd =~/M/
- tell.txt_grey unless @md.cmd =~/q/
+ if @md.cmd =~/[vM]/
+ SiSU_Screen::Ansi.new(@md.cmd,@md.fns,"~meta/#{@md.fns}.meta").output if @md.cmd =~/v/i
+ tell=SiSU_Screen::Ansi.new(@md.cmd,"dal -> #{@make_fns.meta}") if @md.cmd =~/M/
+ tell.txt_grey unless @md.cmd =~/q/
+ end
dal.each{|s| dal_array << s}
dal_array
end