diff options
author | Ralph Amissah <ralph@amissah.com> | 2010-06-11 22:06:53 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2010-06-11 22:06:53 -0400 |
commit | e4932393ec8cce24b7d3390d08a3dc0b5296c261 (patch) | |
tree | c3fc610766a7d211460a5ffba338f05e540605c7 /lib/sisu/v2/sysenv.rb | |
parent | debian/changelog (2.4.3-1) (diff) | |
parent | debian/changelog (2.5.0-1) (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/sysenv.rb')
-rw-r--r-- | lib/sisu/v2/sysenv.rb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index 4daccbcd..8a9e38be 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -1265,6 +1265,14 @@ WOK end end end + def font + def texpdf + (defined? @rc['default']['texpdf_font']) \ + ? @rc['default']['texpdf_font'] \ + : 'Liberation Sans' #'Liberation Sans' #'Liberation Serif' + end + self + end def path #dir def home @sys.home @@ -1329,9 +1337,9 @@ WOK @yamlrc_dir end def man #check use - if defined? @rc['webserv']['man']; "#{webserv}/#{@rc['webserv']['man']}" - else defaults[:webserv_man] - end + (defined? @rc['webserv']['man']) \ + ? "#{webserv}/#{@rc['webserv']['man']}" \ + : defaults[:webserv_man] end def webserv_path #testing, check need, remove webserv |