aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/sisu/v1/sysenv.rb15
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/sisu/v1/sysenv.rb b/lib/sisu/v1/sysenv.rb
index 945cf07c..1adb3509 100644
--- a/lib/sisu/v1/sysenv.rb
+++ b/lib/sisu/v1/sysenv.rb
@@ -211,11 +211,11 @@ module SiSU_Env
@@default_dir=DEFAULT_DIR
m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
stub_pwd=@@pwd[m,1]
- @@rc_path=["#@@pwd/_sisu","#@@home/.sisu",@@sisu_etc]
+ @@rc_path=["#@@pwd/_sisu","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"]
@@yamlrc_path=unless stub_pwd =~/^sisupod$/
- ["#@@pwd/_sisu","#@@home/.sisu",@@sisu_etc]
+ ["#@@pwd/_sisu","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"]
else #security policy: prevent reading of sisurc.yml in sisupod
- ["#@@home/.sisu",@@sisu_etc]
+ ["#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"]
end
@@ad_path=unless stub_pwd =~/^sisupod$/
["#@@pwd/_sisu/skin/yml","#@@home/.sisu/skin/yml","#{@@sisu_etc}/skin/yml"]
@@ -2019,7 +2019,6 @@ WOK
end
def i18n
def language # language settings
-##
m=/.+\/\S+?\~(\S+)/
pwd=Dir.pwd
conf=if defined? @rc['default']['language']; @rc['default']['language']
@@ -2075,7 +2074,7 @@ WOK
end
def odf_structure
rm_rf("#{path.processing}/odf")
- system("unzip -q #{path.share}/odf/odt.zip -d #{path.processing}")
+ system("unzip -q #{path.share}/#{SiSU_version_dir}/odf/odt.zip -d #{path.processing}")
end
def sisupod_gen(fns_pod)
pwd=Dir.pwd
@@ -2642,11 +2641,13 @@ WOK
class Info_version <Info_env
include Singleton
require 'rbconfig'
+ @@lib_path=nil
def get_version
@version={}
@pwd=ENV['PWD']
- yst_etc="#{defaults[:sisu_etc]}/version1.yml"
- lib_path=`echo $RUBYLIB`.split(':')
+ yst_etc="#{defaults[:sisu_etc]}/#{SiSU_version_dir}/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
end
@version