diff options
| author | Ralph Amissah <ralph@amissah.com> | 2015-01-12 09:59:35 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2015-01-19 23:46:16 -0500 |
| commit | b2ccc63796ce0bf17a8c75e857073c8440ee3955 (patch) | |
| tree | 453642e1ff15e6d05c51b588726a1d3a921eec1b /bin | |
| parent | c&d: some cruft (diff) | |
bin + c&d: RbConfig (instead of Config, switch)
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sisu | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -31,7 +31,7 @@ class Orient end def sisu_run_from? if processing.called_as == processing.file_full_path \ - and File.dirname(processing.file_full_path) != Config::CONFIG['bindir'] + and File.dirname(processing.file_full_path) != RbConfig::CONFIG['bindir'] :full_path_to_sisu_bin_in_sisu_dir_tree elsif processing.file_full_path =~/\/gems\// \ and processing.file_full_path \ @@ -149,11 +149,11 @@ class Orient def paths_set if sisu_run_from? == :system_install \ and processing.called_as \ - =~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ + =~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ :set_path_system elsif sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ and processing.called_as \ - !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \ + !~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \ && File.expand_path(processing.called_as) \ =~ /bin\/sisu[#{version.stable}#{version.unstable}]?$/ \ && FileTest.file?(processing.called_as) @@ -166,7 +166,7 @@ class Orient def sisu_path_base case paths_set when :set_path_system - Config::CONFIG['datadir'] + '/sisu' + RbConfig::CONFIG['datadir'] + '/sisu' when :set_dir_tree_full_path File.expand_path(processing.called_as). sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'') @@ -178,7 +178,7 @@ class Orient def sisu_path_base_system_data case paths_set when :set_path_system - Config::CONFIG['datadir'] + '/sisu' + RbConfig::CONFIG['datadir'] + '/sisu' when :set_dir_tree_full_path File.expand_path(processing.called_as). sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'/data/sisu') @@ -189,7 +189,7 @@ class Orient end def sisu_path_specified_lib if (processing.called_as \ - !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/) + !~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/) File.expand_path(processing.called_as). sub(/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'lib') else nil @@ -320,10 +320,10 @@ rescue #% - puts %{ #{%x{ruby -v}.strip.to_s} #{RUBY_VERSION} - ruby version: #{Config::CONFIG['RUBY_PROGRAM_VERSION']}p#{Config::CONFIG['PATCHLEVEL']} - ruby named: #{Config::CONFIG['ruby_version']} - rubylib: #{Config::CONFIG['rubylibdir']} - rubylib local: #{Config::CONFIG['sitelibdir']} + ruby version: #{RbConfig::CONFIG['RUBY_PROGRAM_VERSION']}p#{RbConfig::CONFIG['PATCHLEVEL']} + ruby named: #{RbConfig::CONFIG['ruby_version']} + rubylib: #{RbConfig::CONFIG['rubylibdir']} + rubylib local: #{RbConfig::CONFIG['sitelibdir']} gem dir: #{Gem.dir} gem path: #{Gem.path} } |