diff options
| author | Jeroen van Meeuwen (OGD) <j.van.meeuwen@ogd.nl> | 2009-12-22 01:34:35 +0100 |
|---|---|---|
| committer | Jeroen van Meeuwen (OGD) <j.van.meeuwen@ogd.nl> | 2009-12-22 01:34:35 +0100 |
| commit | 6c8ae98039e8481c694599dc23863e763625c444 (patch) | |
| tree | cf67070bcd0bec3819fab39b71b15f122521e4f4 /gem_prelude.rb | |
| parent | 2f562cc2b75d1f0fa1152c2ce440da34c80964fc (diff) | |
| download | ruby-6c8ae98039e8481c694599dc23863e763625c444.tar.gz ruby-6c8ae98039e8481c694599dc23863e763625c444.tar.xz ruby-6c8ae98039e8481c694599dc23863e763625c444.zip | |
Provide the following searchpath for ruby-1.9.1:
/usr/local/lib{,64}/ruby/1.9.1/
/usr/local/lib{,64}/ruby/1.9/
/usr/local/lib{,64}/ruby/
/usr/local/share/ruby/1.9.1/
/usr/local/share/ruby/1.9/
/usr/local/share/ruby/
/usr/lib{,64}/ruby/1.9.1/
/usr/lib{,64}/ruby/1.9/
/usr/lib{,64}/ruby/
/usr/share/ruby/1.9.1/
/usr/share/ruby/1.9/
/usr/share/ruby/
Diffstat (limited to 'gem_prelude.rb')
| -rw-r--r-- | gem_prelude.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gem_prelude.rb b/gem_prelude.rb index b5da35e18..d2efb8c3a 100644 --- a/gem_prelude.rb +++ b/gem_prelude.rb @@ -113,14 +113,11 @@ if defined?(Gem) then def self.default_dir if defined? RUBY_FRAMEWORK_VERSION then - File.join File.dirname(ConfigMap[:sitedir]), 'Gems', - ConfigMap[:ruby_version] + File.join File.dirname(ConfigMap[:sitedir]), 'Gems' elsif RUBY_VERSION > '1.9' then - File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems', - ConfigMap[:ruby_version]) + File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems') else - File.join(ConfigMap[:libdir], ruby_engine, 'gems', - ConfigMap[:ruby_version]) + File.join(ConfigMap[:libdir], ruby_engine, 'gems') end end @@ -354,6 +351,7 @@ if defined?(Gem) then Gem.push_all_highest_version_gems_on_load_path $" << File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name], Gem::ConfigMap[:ruby_version], "rubygems.rb") + rescue Exception => e puts "Error loading gem paths on load path in gem_prelude" puts e |