diff options
| -rw-r--r-- | data/sisu/v1/v/version.yml (renamed from conf/sisu/v1/version.yml) | 0 | ||||
| -rw-r--r-- | data/sisu/v2/v/version.yml (renamed from conf/sisu/v2/version.yml) | 0 | ||||
| -rw-r--r-- | lib/sisu/v1/sysenv.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v2/sysenv.rb | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/conf/sisu/v1/version.yml b/data/sisu/v1/v/version.yml index 90edca90..90edca90 100644 --- a/conf/sisu/v1/version.yml +++ b/data/sisu/v1/v/version.yml diff --git a/conf/sisu/v2/version.yml b/data/sisu/v2/v/version.yml index e772370c..e772370c 100644 --- a/conf/sisu/v2/version.yml +++ b/data/sisu/v2/v/version.yml diff --git a/lib/sisu/v1/sysenv.rb b/lib/sisu/v1/sysenv.rb index a55b03cc..519c0f9f 100644 --- a/lib/sisu/v1/sysenv.rb +++ b/lib/sisu/v1/sysenv.rb @@ -2648,10 +2648,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 diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index 7d4999f2..6c579a9c 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -2669,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 |