diff options
Diffstat (limited to 'lib/sisu/current')
| -rw-r--r-- | lib/sisu/current/ao.rb | 16 | ||||
| -rw-r--r-- | lib/sisu/current/se_info_env.rb | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lib/sisu/current/ao.rb b/lib/sisu/current/ao.rb index 864d5836..633c4442 100644 --- a/lib/sisu/current/ao.rb +++ b/lib/sisu/current/ao.rb @@ -116,7 +116,7 @@ module SiSU_AO : @opt.fns create_ao rescue - SiSU_Errors::Rescued.new($!,$@,@opt.selection,@@fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections,@@fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -137,7 +137,7 @@ module SiSU_AO ? read_fnc : @@ao_array.dup rescue - SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -158,7 +158,7 @@ module SiSU_AO ? read_idx_sst : @@idx_arr[:sst].dup #check rescue - SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -179,7 +179,7 @@ module SiSU_AO ? read_idx_raw : @@idx_arr[:tex].dup #check rescue - SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -200,7 +200,7 @@ module SiSU_AO ? read_idx_html : @@idx_arr[:html].dup rescue - SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -221,7 +221,7 @@ module SiSU_AO ? read_idx_xhtml : @@idx_arr[:xhtml].dup rescue - SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -242,7 +242,7 @@ module SiSU_AO ? read_map_nametags : @@map_arr[:nametags].dup rescue - SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -263,7 +263,7 @@ module SiSU_AO ? read_map_ocn_htmlseg : @@map_arr[:ocn_htmlseg].dup rescue - SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure diff --git a/lib/sisu/current/se_info_env.rb b/lib/sisu/current/se_info_env.rb index 8917a1d2..85dd043c 100644 --- a/lib/sisu/current/se_info_env.rb +++ b/lib/sisu/current/se_info_env.rb @@ -1081,7 +1081,7 @@ WOK @stub_pod end def etc - defaults[:sisu_etc] #live/dynamic + defaults[:sisu_etc] #live/dynamic end def arch @sys.dir_arch @@ -1125,7 +1125,7 @@ WOK def webserv_path #testing, check need, remove webserv end - def webserv #separation required for webrick which cannot use path.output (different requirements as no file is passed) + def webserv #separation required for webrick which cannot use path.output (different requirements as no file is passed) man_path=if @@man_path.nil? man_path=if defined? @rc['webserv']['path'] \ and @rc['webserv']['path'] =~/\S\S+/ @@ -1163,17 +1163,17 @@ WOK def webserv_map_pwd #dir "#{path.webserv}/#{base_markup_dir_stub}" end - def webserv_dir #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name) + def webserv_dir #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name) defaults[:webserv_dir] end - def webserv_image #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name) + def webserv_image #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name) images=if defined? @rc['webserv']['images'] @rc['webserv']['images'] else defaults[:images] end "#{path.webserv}/#{images}" end - def output #web/webserv output directory... subdirectory into which further subdirectories are made based on file names + def output #web/webserv output directory... subdirectory into which further subdirectories are made based on file names r=Px[:lng_lst_rgx] u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/ base_stub=@sys.pwd.gsub(u,'\1') @@ -1191,7 +1191,7 @@ WOK def feed_home "#{public_output}/#{@rc['webserv']['feed_home']}" end - def scripts #used previously only to include tla version info + def scripts #used previously only to include tla version info if defined? @rc['project']['path'] "#{home}/#{@rc['project']['path']}" end |