From ce3eec09f9beba10403c5f1095526eb8687db15d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 7 Jul 2010 08:02:29 -0400 Subject: sysenv, version.yml moved to /usr/share/sisu (from /etc/sisu) --- conf/sisu/v1/version.yml | 5 ----- conf/sisu/v2/version.yml | 5 ----- data/sisu/v1/v/version.yml | 5 +++++ data/sisu/v2/v/version.yml | 5 +++++ lib/sisu/v1/sysenv.rb | 4 ++-- lib/sisu/v2/sysenv.rb | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 conf/sisu/v1/version.yml delete mode 100644 conf/sisu/v2/version.yml create mode 100644 data/sisu/v1/v/version.yml create mode 100644 data/sisu/v2/v/version.yml diff --git a/conf/sisu/v1/version.yml b/conf/sisu/v1/version.yml deleted file mode 100644 index 90edca90..00000000 --- a/conf/sisu/v1/version.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -:version: 1.0.3 -:date_stamp: 2010w07/3 -:date: "2010-02-17" -:project: SiSU diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml deleted file mode 100644 index e772370c..00000000 --- a/conf/sisu/v2/version.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -:version: 2.5.1 -:date_stamp: 2010w23/6 -:date: "2010-06-12" -:project: SiSU diff --git a/data/sisu/v1/v/version.yml b/data/sisu/v1/v/version.yml new file mode 100644 index 00000000..90edca90 --- /dev/null +++ b/data/sisu/v1/v/version.yml @@ -0,0 +1,5 @@ +--- +:version: 1.0.3 +:date_stamp: 2010w07/3 +:date: "2010-02-17" +:project: SiSU diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml new file mode 100644 index 00000000..e772370c --- /dev/null +++ b/data/sisu/v2/v/version.yml @@ -0,0 +1,5 @@ +--- +:version: 2.5.1 +:date_stamp: 2010w23/6 +:date: "2010-06-12" +:project: SiSU 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 -- cgit v1.2.3