Change where gem stubs go, teach loader how to use them via -S

voxik · Nov 23, 2009 · 73a353c · 73a353c
1 parent 98b5714
commit 73a353c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/kernel/loader.rb b/kernel/loader.rb
@@ -12,6 +12,8 @@ def initialize
       @debugging    = false
       @run_irb      = true
       @printed_version = false
+
+      @gem_bin = File.join Rubinius::CODE_PATH, "gems", "bin"
     end
 
     # Finish setting up after loading kernel.
@@ -165,7 +167,7 @@ def options(argv=ARGV)
         options.stop_parsing
         @run_irb = false
 
-        search = ENV['PATH'].split(File::PATH_SEPARATOR).unshift(BIN_PATH)
+        search = [BIN_PATH, @gem_bin] + ENV['PATH'].split(File::PATH_SEPARATOR)
         dir    = search.detect do |d|
           path = File.join(d, script)
           File.exist?(path)

diff --git a/lib/rubygems/defaults/rbx.rb b/lib/rubygems/defaults/rbx.rb
@@ -5,7 +5,7 @@
 
 module Gem
   def self.default_bindir
-    File.join Rubinius::CODE_PATH, "bin"
+    File.join Rubinius::CODE_PATH, "gems", "bin"
   end
 
   def self.default_dir