diff options
Diffstat (limited to 'lib/sisu/v2/sysenv.rb')
| -rw-r--r-- | lib/sisu/v2/sysenv.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index 1727e630..3a532d65 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -1352,7 +1352,11 @@ WOK man_path=@@man_path=File.expand_path(@rc['webserv']['path']) else nil end - else manpath=@@man_path + else @@man_path + end + man_path_head=man_path.gsub(/(\S+)\/[^\/\s]+$/,'\1') + unless FileTest.directory?(man_path) + mkdir_p(man_path) if File.writable?("#{man_path_head}/.") end @webserv_path=if defined? man_path \ and File.writable?("#{man_path}/.") @@ -1977,7 +1981,7 @@ WOK elsif defined? @rc['program_select']['epub_viewer'] \ and @rc['program_select']['epub_viewer'] =~/\S\S+/ @rc['program_select']['epub_viewer'] - else 'calibre' #'calibre' 'fbreader' + else 'ebook-viewer' #'calibre' 'fbreader' end end def xml_viewer @@ -2665,10 +2669,10 @@ WOK def get_version @version={} @pwd=ENV['PWD'] - yst_etc="#{defaults[:sisu_etc]}/#{SiSU_version_dir}/version.yml" + yst_ver="#{defaults[:sisu_share]}/#{SiSU_version_dir}/v/version.yml" lib_path=@@lib_path ? @@lib_path : `echo $RUBYLIB`.split(':') @@lib_path ||=lib_path - if File.exist?(yst_etc); @version=YAML::load(File::open(yst_etc)) #unless @@noyaml + if File.exist?(yst_ver); @version=YAML::load(File::open(yst_ver)) #unless @@noyaml end @version end |