aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v3/sysenv.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v3/sysenv.rb')
-rw-r--r--lib/sisu/v3/sysenv.rb116
1 files changed, 58 insertions, 58 deletions
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index f5d14583..070ba4f8 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -218,10 +218,10 @@ module SiSU_Env
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}"]) \
+ ? (["#{@@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"]) \
+ ? (["#{@@pwd}/_sisu/skin/yml","#{@@home}/.sisu/skin/yml","#{@@sisu_etc}/skin/yml"])
: ["#{@@home}/.sisu",@@sisu_etc]
attr_accessor :user,:home,:hostname,:pwd,:host,:arch,:rbver,:dir_arch,:dir_sitearch,:dir_bin,:locale,:webserv_path,:webserv_host_cgi,:webserv_port_cgi,:default_dir,:rc_path,:yamlrc_path,:ad_path
def initialize
@@ -251,7 +251,7 @@ module SiSU_Env
require @prog
else
@mandatory \
- ? (SiSU_Screen::Ansi.new(@cmd,"module required: #{@prog}").warn) \
+ ? (SiSU_Screen::Ansi.new(@cmd,"module required: #{@prog}").warn)
: (SiSU_Screen::Ansi.new(@cmd,"#{@prog} load requested").warn)
end
load_prog
@@ -691,14 +691,14 @@ module SiSU_Env
db_name="#{Db[:name_prefix]}#{dbname_stub}"
program_ref="\n\t\tcreatedb dbname #{db_name} #for postgresql database creation"
(program_found?(program)) \
- ? system("#{program} #{dbname_name}") \
+ ? system("#{program} #{dbname_name}")
: (puts "\tWARN: #{program} is not available #{program_ref}")
end
def relaxng(cmd='') #trang - convert between different schema languages for XML
program='trang'
program_ref="\n\t\tsee <http://www.thaiopensource.com/relaxng/trang.html>"
(program_found?(program)) \
- ? system("#{program} #{@input} #{@output}") \
+ ? system("#{program} #{@input} #{@output}")
: (puts "\tWARN: #{program} is not installed #{program_ref}" if cmd =~/V/)
end
def qrencode #qrcode - for generating QR code
@@ -708,7 +708,7 @@ module SiSU_Env
found \
? (system(%{
echo "#{@input}" | #{program} -s 3 -o #{@output}
- })) \
+ }))
: (puts "\tWARN: #{program} is not installed #{program_ref}" if cmd =~/V/)
#found
end
@@ -730,7 +730,7 @@ module SiSU_Env
program=@prog.tidy
program_ref="\n\t\tsee <http://tidy.sourceforge.net/>"
(program_found?(program)) \
- ? system("#{@prog.tidy} -xml #{@input} > #{@output}") \
+ ? system("#{@prog.tidy} -xml #{@input} > #{@output}")
: (puts "\tWARN: #{program} is not installed #{program_ref}")
end
def tex2pdf_engine
@@ -759,11 +759,11 @@ module SiSU_Env
texpdf_cmd=case texpdf
when /xetex/
@input =~/landscape\.tex$/ \
- ? %{#{texpdf} -interaction=#{mode} -fmt=xelatex -papersize="#{papersize} -l" #{@input} #{tell}\n} \
+ ? %{#{texpdf} -interaction=#{mode} -fmt=xelatex -papersize="#{papersize} -l" #{@input} #{tell}\n}
: %{#{texpdf} -interaction=#{mode} -fmt=xelatex -papersize="#{papersize}" #{@input} #{tell}\n}
when /xelatex/
@input =~/landscape\.tex$/ \
- ? %{#{texpdf} -interaction=#{mode} -papersize="#{papersize} -l" #{@input} #{tell}\n} \
+ ? %{#{texpdf} -interaction=#{mode} -papersize="#{papersize} -l" #{@input} #{tell}\n}
: %{#{texpdf} -interaction=#{mode} -papersize="#{papersize}" #{@input} #{tell}\n}
when /pdftex/; "#{texpdf} -interaction=#{mode} -fmt=pdflatex #{@input} #{tell}\n"
when /pdflatex/; "#{texpdf} -interaction=#{mode} #{@input} #{tell}\n"
@@ -776,7 +776,7 @@ module SiSU_Env
program='makeinfo'
program_ref="\n\t\tsee http://www.gnu.org/software/texinfo/"
(program_found?(program)) \
- ? system("#{program} #{@input}\n") \
+ ? system("#{program} #{@input}\n")
: (puts "\tWARN: #{program} is not installed #{program_ref}")
end
def scp
@@ -1016,13 +1016,13 @@ module SiSU_Env
def concord_max
((defined? @rc['processing']['concord_max']) \
&& @rc['processing']['concord_max']) \
- ? @rc['processing']['concord_max'] \
+ ? @rc['processing']['concord_max']
: (defaults[:concord_max])
end
def language_default_set #set directory (default) language
((defined? @rc['default']['language']) \
&& @rc['default']['language'] =~/\S+/) \
- ? @rc['default']['language'] \
+ ? @rc['default']['language']
: 'en'
end
def markup_emphasis
@@ -1047,7 +1047,7 @@ module SiSU_Env
&& (@rc['default']['text_wrap'].to_s=~/\d\d+/) \
&& (@rc['default']['text_wrap'].to_i > 19) \
&& (@rc['default']['text_wrap'].to_i < 201)) \
- ? @rc['default']['text_wrap'].to_i \
+ ? @rc['default']['text_wrap'].to_i
: 78
end
#def by_language?
@@ -1101,13 +1101,13 @@ module SiSU_Env
def html_seg_title_banner?
((defined? @rc['html']['seg_title_banner']) \
&& @rc['html']['seg_title_banner']==true) \
- ? @rc['html']['seg_title_banner'] \
+ ? @rc['html']['seg_title_banner']
: false
end
def html_quick_ref?
((defined? @rc['html']['quick_ref']) \
&& @rc['html']['quick_ref']==true) \
- ? @rc['html']['quick_ref'] \
+ ? @rc['html']['quick_ref']
: false
end
def html_minitoc?
@@ -1127,13 +1127,13 @@ module SiSU_Env
def odt_ocn?
((defined? @rc['odt']['ocn']) \
&& @rc['odt']['ocn']==true) \
- ? @rc['odt']['ocn'] \
+ ? @rc['odt']['ocn']
: false
end
def plaintext_ocn?
((defined? @rc['plaintext']['ocn']) \
&& @rc['plaintext']['ocn']==true) \
- ? @rc['plaintext']['ocn'] \
+ ? @rc['plaintext']['ocn']
: false
end
def widget #needs (md) #move
@@ -1222,7 +1222,7 @@ module SiSU_Env
db=if rc['search']['sisu']['flag']==true \
and rc['search']['sisu']['db']=~/\S+/
(rc['search']['sisu']['db']=~/^#{Db[:name_prefix]}\S+/) \
- ? rc['search']['sisu']['db'] \
+ ? rc['search']['sisu']['db']
: "#{Db[:name_prefix]}#{rc['search']['sisu']['db']}"
else nil
end
@@ -1279,7 +1279,7 @@ WOK
db=if rc['search']['sisu']['flag']==true \
and rc['search']['sisu']['db']=~/\S+/
(rc['search']['sisu']['db']=~/^#{Db[:name_prefix]}\S+/) \
- ? rc['search']['sisu']['db'] \
+ ? rc['search']['sisu']['db']
: "#{Db[:name_prefix]}#{rc['search']['sisu']['db']}"
else nil
end
@@ -1376,7 +1376,7 @@ WOK
and rc['search']['sisu']['flag']==true
db=if rc['search']['sisu']['db']=~/\S+/
(rc['search']['sisu']['db']=~/^#{Db[:name_prefix]}\S+/) \
- ? rc['search']['sisu']['db'] \
+ ? rc['search']['sisu']['db']
: "#{Db[:name_prefix]}#{rc['search']['sisu']['db']}"
else nil
end
@@ -1449,7 +1449,7 @@ WOK
def texpdf
(defined? @rc['default']['texpdf_font']) \
&& (@rc['default']['texpdf_font']=~/\S{3,}/) \
- ? @rc['default']['texpdf_font'] \
+ ? @rc['default']['texpdf_font']
: 'Liberation Sans' #'Liberation Sans' #'Liberation Serif'
end
self
@@ -1601,7 +1601,7 @@ WOK
end
def man #check use
(defined? @rc['webserv']['man']) \
- ? "#{webserv}/#{@rc['webserv']['man']}" \
+ ? "#{webserv}/#{@rc['webserv']['man']}"
: defaults[:webserv_man]
end
def webserv_path #testing, check need, remove
@@ -1658,7 +1658,7 @@ WOK
end
def feed
(defined? @rc['webserv']['feed']) \
- ? ("#{public_output}/#{@rc['webserv']['feed']}") \
+ ? ("#{public_output}/#{@rc['webserv']['feed']}")
: (defaults[:webserv_feed])
end
def feed_home
@@ -1670,12 +1670,12 @@ WOK
end
def cgi
(defined? @rc['webserv']['cgi']) \
- ? "#{@rc['webserv']['cgi']}" \
+ ? "#{@rc['webserv']['cgi']}"
: (defaults[:webserv_cgi])
end
def php
(defined? @rc['webserv']['php']) \
- ? "#{public_output}/#{@rc['webserv']['php']}" \
+ ? "#{public_output}/#{@rc['webserv']['php']}"
: (defaults[:webserv_php])
end
# programs
@@ -1764,7 +1764,7 @@ WOK
end
def stub_dir
(usr_dir?) \
- ? ("#{root_dir}/#{user}/#{stub_pwd}") \
+ ? ("#{root_dir}/#{user}/#{stub_pwd}")
: ("#{root_dir}/#{stub_pwd}") # see defaults[:processing_path]
end
def processing #processing directory, used/needed for sisu work files, has sub-directories (dal,tex etc)
@@ -1822,7 +1822,7 @@ WOK
and not @rc['git']['dir'].nil? \
and not @rc['git']['dir'].empty?
x=(@rc['git']['dir'] =~/^(?:~|home)$/) \
- ? home + '/' + 'sisu:' \
+ ? home + '/' + 'sisu:'
: @rc['git']['dir'] + '/' + 'sisu:'
else defaults[:processing_git]
end
@@ -2223,7 +2223,7 @@ WOK
def pdf_viewer
((defined? @rc['program_select']['pdf_viewer']) \
&& @rc['program_select']['pdf_viewer'] =~/\S\S+/) \
- ? @rc['program_select']['pdf_viewer'] \
+ ? @rc['program_select']['pdf_viewer']
: 'pdf-viewer' #'evince'
end
def web_browser
@@ -2255,13 +2255,13 @@ WOK
def epub_viewer
((defined? @rc['program_select']['epub_viewer']) \
&& @rc['program_select']['epub_viewer'] =~/\S\S+/) \
- ? @rc['program_select']['epub_viewer'] \
+ ? @rc['program_select']['epub_viewer']
: 'ebook-viewer' #'calibre' 'fbreader'
end
def xml_viewer
((defined? @rc['program_select']['xml_viewer']) \
&& @rc['program_select']['xml_viewer'] =~/\S\S+/) \
- ? @rc['program_select']['xml_viewer'] \
+ ? @rc['program_select']['xml_viewer']
: text_editor
end
def xml_editor
@@ -2270,7 +2270,7 @@ WOK
def odf_viewer
((defined? @rc['program_select']['odf_viewer']) \
&& @rc['program_select']['odf_viewer'] =~/\S\S+/) \
- ? @rc['program_select']['odf_viewer'] \
+ ? @rc['program_select']['odf_viewer']
: 'lowriter' #'odf-viewer','oowriter'
end
def manpage_viewer
@@ -2279,13 +2279,13 @@ WOK
def manpage_generator
((defined? @rc['program_select']['man']) \
&& @rc['program_select']['man'] =~/\S\S+/) \
- ? @rc['program_select']['man'] \
+ ? @rc['program_select']['man']
: 'nroff -man' #'nroff -man' #'groff -man -Tascii'
end
def texinfo
((defined? @rc['program_select']['info_viewer']) \
&& @rc['program_select']['info_viewer'] =~/\S\S+/) \
- ? @rc['program_select']['info_viewer'] \
+ ? @rc['program_select']['info_viewer']
: 'pinfo -f' #'pinfo -f' 'info' 'tkinfo'
end
def file_encoding
@@ -2348,7 +2348,7 @@ WOK
x=if output_dir_structure.by_language_code?
(( defined? @rc['default']['language_file']) \
&& @rc['default']['language_file'] != nil) \
- ? @rc['default']['language_file'] \
+ ? @rc['default']['language_file']
: 1
else 0
end
@@ -2376,7 +2376,7 @@ WOK
end
def papersize # paper settings, default overidden in param if set within document
(defined? @rc['default']['papersize']) \
- ? @rc['default']['papersize'].downcase \
+ ? @rc['default']['papersize'].downcase
: (defaults[:papersize].downcase)
end
def odf_structure
@@ -2473,7 +2473,7 @@ WOK
super()
@opt=opt #,opt.fns,opt.cmd
@env=(@opt.fns && !(@opt.fns.empty?) \
- ? (SiSU_Env::Info_env.new(@opt.fns)) \
+ ? (SiSU_Env::Info_env.new(@opt.fns))
: (SiSU_Env::Info_env.new('dummy.sst')))
if @opt.cmd =~/m/; @md=SiSU_Param::Parameters.new(@opt).get
end
@@ -2573,22 +2573,22 @@ WOK
else '*' + filetypes # one relevant file type
end
@source_path=(@fnb && !(@fnb.empty?) \
- ? "#{@env.path.output}/#{@fnb}" \
+ ? "#{@env.path.output}/#{@fnb}"
: @env.path.output)
@source_path_epub=(@fnb && !(@fnb.empty?) \
- ? "#{@env.path.output}/epub" \
+ ? "#{@env.path.output}/epub"
: @env.path.output_epub)
@source_path_src=(@fnb && !(@fnb.empty?) \
- ? "#{@env.path.output}/src" \
+ ? "#{@env.path.output}/src"
: @env.path.output_src)
@source_path_pod=(@fnb && !(@fnb.empty?) \
- ? "#{@env.path.output}/pod" \
+ ? "#{@env.path.output}/pod"
: @env.path.output_pod)
@source_path_harvest=(@fnb && !(@fnb.empty?) \
- ? "#{@env.path.output}/manifest" \
+ ? "#{@env.path.output}/manifest"
: @env.path.output_harvest)
@local_sisu_source=(@filetypes =~/\S/) \
- ? "#{@source_path}/#{@filetypes}" \
+ ? "#{@source_path}/#{@filetypes}"
: @source_path
end
end
@@ -2609,7 +2609,7 @@ WOK
def zap
def main_output
(@zap !~/\/\//) \
- ? (rm_rf(@zap) if FileTest.directory?(@zap)) \
+ ? (rm_rf(@zap) if FileTest.directory?(@zap))
: (puts 'suspect zap request, ignored')
end
def site_map
@@ -2687,32 +2687,32 @@ WOK
def rhost
def r1
(defined? SiSU_Env::Info_remote_host.new.remote_host[0][:name]) \
- ? (SiSU_Env::Info_remote_host.new.remote_host[0][:name]) \
+ ? (SiSU_Env::Info_remote_host.new.remote_host[0][:name])
: nil
end
def r2
(defined? SiSU_Env::Info_remote_host.new.remote_host[1][:name]) \
- ? (SiSU_Env::Info_remote_host.new.remote_host[1][:name]) \
+ ? (SiSU_Env::Info_remote_host.new.remote_host[1][:name])
: nil
end
def r3
(defined? SiSU_Env::Info_remote_host.new.remote_host[2][:name]) \
- ? (SiSU_Env::Info_remote_host.new.remote_host[2][:name]) \
+ ? (SiSU_Env::Info_remote_host.new.remote_host[2][:name])
: nil
end
def r4
(defined? SiSU_Env::Info_remote_host.new.remote_host[3][:name]) \
- ? (SiSU_Env::Info_remote_host.new.remote_host[3][:name]) \
+ ? (SiSU_Env::Info_remote_host.new.remote_host[3][:name])
: nil
end
def r5
(defined? SiSU_Env::Info_remote_host.new.remote_host[4][:name]) \
- ? (SiSU_Env::Info_remote_host.new.remote_host[4][:name]) \
+ ? (SiSU_Env::Info_remote_host.new.remote_host[4][:name])
: nil
end
def r6
(defined? SiSU_Env::Info_remote_host.new.remote_host[5][:name]) \
- ? (@ls + SiSU_Env::Info_remote_host.new.remote_host[5][:name]) \
+ ? (@ls + SiSU_Env::Info_remote_host.new.remote_host[5][:name])
: nil
end
self
@@ -3706,12 +3706,12 @@ WOK
end
def po #check
(@fno.empty?) \
- ? (@md.fn[:po]) \
+ ? (@md.fn[:po])
: (@fno + '.po')
end
def pot
(@fno.empty?) \
- ? (@md.fn[:pot]) \
+ ? (@md.fn[:pot])
: (@fno + '.pot')
end
def sisupod
@@ -4528,14 +4528,14 @@ WOK
def share_source?
((defined? @rc['db']['share_source']) \
&& @rc['db']['share_source']==true) \
- ? @rc['db']['share_source'] \
+ ? @rc['db']['share_source']
: false
end
def engine
def default
((defined? @rc['db']['engine']['default']) \
&& @rc['db']['engine']['default']=~/postgresql|sqlite/) \
- ? @rc['db']['engine']['default'] \
+ ? @rc['db']['engine']['default']
: 'sqlite'
end
self
@@ -4544,7 +4544,7 @@ WOK
def user
((defined? @rc['db']['postgresql']['user']) \
&& @rc['db']['postgresql']['user']=~/\S+/) \
- ? @rc['db']['postgresql']['user'] \
+ ? @rc['db']['postgresql']['user']
: @env.user
end
def db #db_name
@@ -4554,24 +4554,24 @@ WOK
((defined? @rc['db']['postgresql']['port']) \
&& ( @rc['db']['postgresql']['port'] =~/\d+/ \
|| @rc['db']['postgresql']['port'].class==Fixnum)) \
- ? @rc['db']['postgresql']['port'] \
+ ? @rc['db']['postgresql']['port']
: (@defaults[:postgresql_port])
end
def password
((defined? @rc['db']['postgresql']['password']) \
&& @rc['db']['postgresql']['password']=~/\S+/) \
- ? @rc['db']['postgresql']['password'] \
+ ? @rc['db']['postgresql']['password']
: ''
end
def host
((defined? @rc['db']['postgresql']['host']) \
&& @rc['db']['postgresql']['host']=~/(?:\S{1,3}\.){3}\S{1,3}|\S+?\.\S+/) \
- ? @rc['db']['postgresql']['host'] \
+ ? @rc['db']['postgresql']['host']
: ''
end
def dbi
(psql.host =~/(?:\S{1,3}\.){3}\S{1,3}|\S+?\.\S+/) \
- ? "DBI:Pg:database=#{psql.db};host=#{psql.host};port=#{psql.port}" \
+ ? "DBI:Pg:database=#{psql.db};host=#{psql.host};port=#{psql.port}"
: "DBI:Pg:database=#{psql.db};port=#{psql.port}"
end
def conn_dbi