diff options
author | Ralph Amissah <ralph@amissah.com> | 2012-10-03 00:15:31 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2012-10-03 00:15:31 -0400 |
commit | ac4a6aaa1f4db1237f2a0192a5dc63c8c4057be9 (patch) | |
tree | d4147b4096aea00b6236a81aba962830c6b8400a /lib/sisu/v4/sysenv.rb | |
parent | v4: 4.0.0 new branch & version & changelog "opened" (diff) |
v4: bin/sisu $0, make possible to run sisu command on/within project dir tree
* (previously sisu needed to be correctly installed with system paths honored)
* NOTE: loading of skins turned off
Diffstat (limited to 'lib/sisu/v4/sysenv.rb')
-rw-r--r-- | lib/sisu/v4/sysenv.rb | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index c4b364ad..90df10fa 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -5668,48 +5668,8 @@ WOK end @skin_apply end - def select # skin loading logic here - load "#{SiSU_lib}/defaults.rb" - skin_path=[] - @env.sys.rc_path.each {|x| skin_path << "#{x}/skin"} - skin_path << "#{@env.processing_path.processing}/external_document/skin" - 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 - elsif @pwd_stub =~/^(?:doc|sisupod)$/ # consider/reconsider doc - false - else true - end - doc_skin,dir_skin=nil,nil - if skin - unless @d_sk.nil? - sk_doc="doc/#{@d_sk}.rb" - skin_path.each do |v| # document skin priority 1 - if FileTest.file?("#{v}/#{sk_doc}") - doc_skin="#{v}/#{sk_doc}" - load doc_skin - break - end - end - end - unless doc_skin - sk_dir="dir/skin_#{@pwd_stub}.rb" - skin_path.each do |v| # directory skin priority 2 - if FileTest.file?("#{v}/#{sk_dir}") - dir_skin="#{v}/#{sk_dir}" - load dir_skin - break - end - end - end - end - sk=if doc_skin; doc_skin - elsif dir_skin; dir_skin - else nil - end + def select # skin loading logic here, removed + nil end end class CSS_Default |