diff options
author | Ralph Amissah <ralph@amissah.com> | 2010-07-28 14:42:08 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2010-07-28 14:42:08 -0400 |
commit | 84b346542ac88cdbcf97d0aaff15ba49ddffe83a (patch) | |
tree | 11a8b1824fcabd05d1cc039812492eda912a3e09 /lib/sisu/v2/sysenv.rb | |
parent | debian/control Maintainer changed, Uploaders added, Homepage moved (diff) | |
parent | sisu-2.6.3 changelog, date, version (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/sysenv.rb')
-rw-r--r-- | lib/sisu/v2/sysenv.rb | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index 8f330343..12348dc3 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -614,7 +614,7 @@ module SiSU_Env false end end - def psql #psql + def psql #psql program='psql' program_ref="\n\t\tpsql requested" if program_found?(program); true @@ -680,7 +680,7 @@ module SiSU_Env end @texpdf end - def latex2pdf(md,papersize='a4') #convert from latex to pdf + def latex2pdf(md,papersize='a4') #convert from latex to pdf tell=((@cmd =~/[MVv]/) ? '' : '> /dev/null' ) mode='batchmode' #mode='nonstopmode' @@ -900,7 +900,7 @@ module SiSU_Env @@current_document||=Dir.pwd @@current_document end - def stub_pwd #200412 + def stub_pwd #200412 @stub_pwd end def stub_md_harvest @@ -935,6 +935,13 @@ module SiSU_Env def defaults #multiple default directories @default_dir ||=@sys.default_dir #DEFAULT_DIR end + def manifest_minitoc? + flag=if defined? @rc['manifest']['minitoc'] \ + and not @rc['manifest']['minitoc'].nil? + @rc['manifest']['minitoc'] + else false + end + end def widget #needs (md) #move @rc=SiSU_Env::Get_init.instance.yamlrc @ad=SiSU_Env::Get_init.instance.ads @@ -955,8 +962,7 @@ module SiSU_Env and @rc['promo'].length > 0 @flag[:rc]=true true - else - false + else false end @flag end @@ -1308,13 +1314,13 @@ WOK def bin @sys.dir_bin end - def share #shared data repository source directory + def share #shared data repository source directory defaults[:sisu_share] end def style defaults[:stylesheet_stub] end - def sample_data #sample data repository source directory + def sample_data #sample data repository source directory defaults[:sample_data_path] end def rc @@ -1345,7 +1351,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+/ @@ -1378,17 +1384,17 @@ WOK def webserv_map_pwd #dir "#{path.webserv}/#{stub_pwd}" 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 "#{path.webserv}/#{@stub_pwd}" end def output_src @@ -1754,7 +1760,7 @@ WOK end end end - def webserv_cgi #web url for local webserv (localhost, or hostname) + def webserv_cgi #web url for local webserv (localhost, or hostname) if defined? @rc['webserv_cgi']['host'] \ and not @rc['webserv_cgi']['host'].nil? http=((@rc['webserv_cgi']['host'] =~ /https?:\/\//) ? '' : 'http://') #check https? missing @@ -1770,7 +1776,7 @@ WOK end end end - def webserv_base_cgi #web url for local webserv (localhost, or hostname) + def webserv_base_cgi #web url for local webserv (localhost, or hostname) if defined? @rc['webserv_cgi']['host'] \ and not @rc['webserv_cgi']['host'].nil? http=((@rc['webserv_cgi']['host'] =~ /https?:\/\//) ? '' : 'http://') @@ -1801,7 +1807,7 @@ WOK "#{http}#{webserv_host_base}" else "#{http}localhost" end end - def webserv #web url for local webserv (localhost, or hostname) + def webserv #web url for local webserv (localhost, or hostname) if path.webserv_dir \ and path.webserv =~ /#{path.webserv_dir}/ #revisit "#{path.webserv}/#{@stub_pwd}".gsub(/#{path.webserv_dir}/,"#{url.hostname}/#{@stub_pwd}") @@ -1813,7 +1819,7 @@ WOK else "#{url.hostname}/#{@stub_pwd}" end end - def webserv_base #web url for local webserv (localhost, or hostname) + def webserv_base #web url for local webserv (localhost, or hostname) if path.webserv_dir \ and path.webserv =~ /#{path.webserv_dir}/ #revisit "#{path.webserv}/#{@stub_pwd}".gsub(/#{path.webserv_dir}/,"#{url.hostname}") @@ -2040,7 +2046,7 @@ WOK self end def i18n - def language # language settings + def language # language settings m=/.+\/\S+?\~(\S+)/ pwd=Dir.pwd conf=(defined? @rc['default']['language']) ? @rc['default']['language'] : nil @@ -2172,10 +2178,10 @@ WOK end end class Info_settings < Info_env - def permission?(prog) #program defaults + def permission?(prog) #program defaults (defined? @rc['permission_set'][prog]) ? @rc['permission_set'][prog] : false end - def program?(prog) #program defaults + def program?(prog) #program defaults (defined? @rc['program_set'][prog]) ? @rc['program_set'][prog] : false end end @@ -2204,7 +2210,7 @@ WOK and @md.cmd !~ /[hH]/ ft << @md.fn[:manifest] end - if @md.cmd =~ /a/; ft << @md.fn[:plain] + if @md.cmd =~ /[at]/; ft << @md.fn[:plain] end if @md.cmd =~ /b/; ft << @md.fn[:xhtml] end @@ -2546,7 +2552,7 @@ WOK end end end - def scp_base #base site + def scp_base #base site self.remote_host_base.each do |remote_conn| local=@source_path remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." @@ -2564,7 +2570,7 @@ WOK end end end - def scp_base_all #base site + def scp_base_all #base site self.remote_host_base.each do |remote_conn| local=@source_path remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." @@ -2586,7 +2592,7 @@ WOK end end end - def rsync_base #base site + def rsync_base #base site ldest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu" image_sys="#{@env.path.webserv}/_sisu/image_sys" images="#{@env.path.webserv}/_sisu/image" @@ -2610,7 +2616,7 @@ WOK end end end - def rsync_base_sync #base site + def rsync_base_sync #base site self.remote_host_base.each do |remote_conn| local=@source_path remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." @@ -2633,7 +2639,7 @@ WOK end end end - def rsync_sitemaps #sitemap directory + def rsync_sitemaps #sitemap directory self.remote_host_base.each do |remote_conn| local="#{@source_path}/sitemapindex.xml" remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." @@ -2832,7 +2838,7 @@ WOK @env.url.webrick_port end end - class Info_program < Info_env #revisit + class Info_program < Info_env #revisit attr_accessor :editor,:wc,:tidy,:rexml,:pdflatex,:postgresql,:sqlite def initialize prog=SiSU_Env::Info_env.new.program |