diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-01-17 21:38:51 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-01-17 21:38:51 -0500 |
| commit | b98c0aab9048cfd02cee0afb61ba0415aa90829d (patch) | |
| tree | 86a6eb92cb55c114a12e3c74f20912d092e89f51 /lib/sisu/v4 | |
| parent | debian/changelog (4.2.18-1) (diff) | |
| parent | bin/sisu experimentation (diff) | |
Merge tag 'sisu_4.2.19' into debian/sid
SiSU 4.2.19
Diffstat (limited to 'lib/sisu/v4')
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index b216089d..341a29f7 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -3599,11 +3599,13 @@ WOK if File.exist?(yst_ver) @version=YAML::load(File::open(yst_ver)) #unless @@noyaml end - spec = Gem::Specification.find_by_name("sisu") - gem_root = spec.gem_dir - @version[:install_method]=(File.dirname(__FILE__.gsub(/\/lib\/sisu\/#{SiSU_version_dir}/,'')) == gem_root) \ - ? ' (ruby gem install)' - : '' + @version[:install_method]=if SiSU_is==:gem_install + spec = Gem::Specification.find_by_name("sisu") + gem_root = spec.gem_dir + (File.dirname(__FILE__.gsub(/\/lib\/sisu\/#{SiSU_version_dir}/,'')) == gem_root) \ + ? ' (ruby gem install)' : '' + else '' + end @version end def rbversion @@ -6320,9 +6322,12 @@ WOK cp_images(src,dest) if FileTest.directory?(src) end def cp_base_images #fix images - src=SiSU_path_base \ - ? SiSU_path_base + '/data/sisu/image' - : "#{@env.path.share}/image" + src=if SiSU_path_base == :system_default \ + or SiSU_path_base == nil + @env.path.share + '/image' + else + SiSU_path_base + '/data/sisu/image' + end dest_arr=[ "#{@env.path.webserv}/_sisu/image_sys", "#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_sys" |