From 67e49a2b278b1512fb39a33a779f68a1389f9849 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 3 May 2010 19:09:54 -0400
Subject: ansi, screen info related, arranging

---
 lib/sisu/v2/sysenv.rb | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'lib/sisu/v2/sysenv.rb')

diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb
index 05277012..f440fd3f 100644
--- a/lib/sisu/v2/sysenv.rb
+++ b/lib/sisu/v2/sysenv.rb
@@ -246,10 +246,9 @@ module SiSU_Env
       if load_prog
         require @prog
       else
-        tell=if @mandatory; SiSU_Screen::Ansi.new(@cmd,"module required: #{@prog}")
-        else                SiSU_Screen::Ansi.new(@cmd,"#{@prog} load requested")
-        end
-        tell.warn
+        @mandatory \
+        ? (SiSU_Screen::Ansi.new(@cmd,"module required: #{@prog}").warn) \
+        : (SiSU_Screen::Ansi.new(@cmd,"#{@prog} load requested").warn)
       end
       load_prog
     end
@@ -1865,8 +1864,7 @@ WOK
             cmd=if @cmd; @cmd
             else ''
             end
-            tell=SiSU_Screen::Ansi.new(cmd,"WARNING - no local image directory or images:", defaults[:image_local] )
-            tell.warn unless cmd =~/q/
+            SiSU_Screen::Ansi.new(cmd,"WARNING - no local image directory or images:", defaults[:image_local] ).warn unless cmd =~/q/
             @@local_image=false
           end
           url.images
@@ -1884,8 +1882,7 @@ WOK
           '../_sisu/image_external'
         else
           if @@local_image==true
-            tell=SiSU_Screen::Ansi.new(@cmd,"WARNING - image directory for external images or no such images:", :image_external )
-            tell.warn unless @cmd =~/q/
+            SiSU_Screen::Ansi.new(@cmd,"WARNING - image directory for external images or no such images:", :image_external ).warn unless @cmd =~/q/
             @@local_image=false
           end
           url.images_external
@@ -2098,8 +2095,7 @@ WOK
       if FileTest.file?("#{Dir.pwd}/#{fns_pod}")
         system("unzip -q #{Dir.pwd}/#{fns_pod} -d #{path.processing}")
       else
-        tell=SiSU_Screen::Ansi.new('',"file not found: #{fns_pod}")
-        tell.warn unless @cmd=~/q/
+        SiSU_Screen::Ansi.new('',"file not found: #{fns_pod}").warn unless @cmd=~/q/
       end
       sisupod_processing_path
     end
@@ -3285,7 +3281,7 @@ WOK
       css_path=['/etc/sisu/css',"#{@home}/.sisu/css","#{@pwd}/_sisu/css"] #BROKEN
       if defined? @rc['permission_set']['css_modify'] \
       and @rc['permission_set']['css_modify']
-        tell=SiSU_Screen::Ansi.new(@cmd,"modify is css set to: #{@rc['permission_set']['css_modify']}")
+        SiSU_Screen::Ansi.new(@cmd,"modify is css set to: #{@rc['permission_set']['css_modify']}").warn if @cmd=~/[MV]/
         css_path.each do |x|
           if FileTest.directory?(x)
             cd(x)
@@ -3296,9 +3292,8 @@ WOK
             cd(@pwd)
           end
         end
-      else tell=SiSU_Screen::Ansi.new(@cmd,"modify css is not set or is set to: false")
+      else SiSU_Screen::Ansi.new(@cmd,"modify css is not set or is set to: false").warn if @cmd=~/[MV]/
       end
-      tell.warn if @cmd=~/[MV]/
       fn_css=SiSU_Env::CSS_default.new
       css=SiSU_Style::CSS.new
       path_style="#{@env.path.output}/#{@env.path.style}"
-- 
cgit v1.2.3