fix load path rejiggering to be less janky and also work

1 files changed, 3 insertions, 2 deletions

diff --git a/bin/ohai b/bin/ohai
index 5c9004a6..cb900e39 100755
--- a/bin/ohai
+++ b/bin/ohai
@@ -19,9 +19,7 @@
 # limitations under the License.
 #
 
-require 'rubygems'
 
-$: << File.join(File.dirname(__FILE__), "..", "lib")
 begin
   require 'rubygems'
 rescue LoadError
@@ -29,6 +27,9 @@ rescue LoadError
   missing_rubygems = true
 end
 begin
+  # if we're in a source code checkout, we want to run the code from that.
+  # have to do this *after* rubygems is loaded.
+  $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
   require 'ohai/application'
 rescue LoadError
   if missing_rubygems