From ccc842878dd4a41efd960e37822f354b881f13d6 Mon Sep 17 00:00:00 2001 From: drbrain Date: Sat, 22 Dec 2007 02:32:18 +0000 Subject: Place bin dir before lib dir so gem bin stubs work. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ gem_prelude.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca8820c027..97beb0df24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Dec 22 11:31:14 2007 Eric Hodel + + * gem_prelude.rb: Place bin dir before lib dir so gem bin stubs work. + Sat Dec 22 11:05:44 2007 Jim Weirich * lib/rake.rb (Rake): Added Rake and related libraries to the diff --git a/gem_prelude.rb b/gem_prelude.rb index 88ffe17538..d2c54d3fa0 100644 --- a/gem_prelude.rb +++ b/gem_prelude.rb @@ -152,8 +152,8 @@ module Gem if File.exist?(File.join(path, ".require_paths")) require_paths.concat(File.read(File.join(path, ".require_paths")).split.map {|require_path| File.join(path, require_path)}) else - require_paths << File.join(path, "lib") if File.exist?(File.join(path, "lib")) require_paths << File.join(path, "bin") if File.exist?(File.join(path, "bin")) + require_paths << File.join(path, "lib") if File.exist?(File.join(path, "lib")) end end @@ -186,4 +186,4 @@ rescue Exception => e end #puts "Gem load in #{Time.now - t} seconds" -end # Gem::Enable \ No newline at end of file +end # Gem::Enable -- cgit v1.2.3