From 705ccf77b4b61dca16137ada741d1765a52ca573 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 13 Sep 2011 19:16:23 -0400
Subject: v3: hub (affecting options +others) sisupod processing (v2 enabled)

---
 lib/sisu/v3/sysenv.rb | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

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

diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index a24937d2..f052e2a5 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -217,9 +217,10 @@ module SiSU_Env
     m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
     stub_pwd=@@pwd[m,1]
     @@rc_path=["#{@@pwd}/_sisu/#{SiSU_version_dir}","#{@@pwd}/_sisu","#{@@home}/.sisu/#{SiSU_version_dir}","#{@@home}/.sisu","#{@@sisu_etc}/#{SiSU_version_dir}"]
-    @@yamlrc_path=(stub_pwd !~/^sisupod$/) \
-    ? (["#{@@pwd}/_sisu/#{SiSU_version_dir}","#{@@pwd}/_sisu","#{@@home}/.sisu/#{SiSU_version_dir}","#{@@home}/.sisu","#{@@sisu_etc}/#{SiSU_version_dir}"])
-    : ["#{@@home}/.sisu/#{SiSU_version_dir}","#{@@home}/.sisu","#{@@sisu_etc}/#{SiSU_version_dir}"]  #security policy: prevent reading of sisurc.yml in sisupod
+    @@yamlrc_path=["#{@@pwd}/_sisu/#{SiSU_version_dir}","#{@@pwd}/_sisu","#{@@home}/.sisu/#{SiSU_version_dir}","#{@@home}/.sisu","#{@@sisu_etc}/#{SiSU_version_dir}"]
+    #@@yamlrc_path=(stub_pwd !~/^sisupod$/) \
+    #? (["#{@@pwd}/_sisu/#{SiSU_version_dir}","#{@@pwd}/_sisu","#{@@home}/.sisu/#{SiSU_version_dir}","#{@@home}/.sisu","#{@@sisu_etc}/#{SiSU_version_dir}"])
+    #: ["#{@@home}/.sisu/#{SiSU_version_dir}","#{@@home}/.sisu","#{@@sisu_etc}/#{SiSU_version_dir}"]  #security policy: prevent reading of sisurc.yml in sisupod
     @@ad_path=(stub_pwd !~/^sisupod$/) \
     ? (["#{@@pwd}/_sisu/skin/yml","#{@@home}/.sisu/skin/yml","#{@@sisu_etc}/skin/yml"])
     : ["#{@@home}/.sisu",@@sisu_etc]
@@ -2496,11 +2497,9 @@ WOK
       unless FileTest.directory?(sisupod_processing_path)
         mkdir_p(sisupod_processing_path)
       end
-      if FileTest.file?("#{Dir.pwd}/#{fns_pod}")
-        system("unzip -q #{Dir.pwd}/#{fns_pod} -d #{processing_path.processing}")
-      else
-        SiSU_Screen::Ansi.new('',"file not found: #{fns_pod}").warn unless @cmd=~/q/
-      end
+      (FileTest.file?(fns_pod)) \
+      ? system("unzip -q #{fns_pod} -d #{processing_path.processing}")
+      : (SiSU_Screen::Ansi.new('',"file not found: #{fns_pod}").warn unless @cmd=~/q/)
       sisupod_processing_path
     end
   end
@@ -2563,10 +2562,14 @@ WOK
   end
   class Info_settings < Info_env
     def permission?(prog)                                                      #program defaults
-      (defined? @rc['permission_set'][prog]) ? @rc['permission_set'][prog] : false
+      (defined? @rc['permission_set'][prog]) \
+      ? @rc['permission_set'][prog]
+      : false
     end
     def program?(prog)                                                         #program defaults
-      (defined? @rc['program_set'][prog]) ? @rc['program_set'][prog] : false
+      (defined? @rc['program_set'][prog]) \
+      ? @rc['program_set'][prog]
+      : false
     end
   end
   class File_map < Info_env
@@ -4783,10 +4786,13 @@ WOK
       skin_path=[]
       @env.sys.rc_path.each {|x| skin_path << "#{x}/skin"}
       skin_path << "#{@env.processing_path.processing}/external_document/skin"
-      skin=true
-      if @pwd_stub =~/^sisupod$/ \
-      and @md.opt.mod.inspect !~/--trust/
-        skin=false  #security only run skins on sisupod if --trust flag is provided
+      skin=if @pwd_stub =~/^(?:doc|sisupod)$/ \
+      and ((! @md.nil?) \
+      && (defined? @md.opt) \
+      && (defined? @md.opt.mod) \
+      && @md.opt.mod.inspect =~/--trust/)
+        true                                                                   #security only run skins on sisupod if --trust flag is provided
+      else false
       end
       doc_skin,dir_skin=nil,nil
       if skin
-- 
cgit v1.2.3