Search $PATH for a binary rather than shelling out to `which`

1 files changed, 12 insertions, 1 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index 97e6e28300..53b5125101 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -229,7 +229,7 @@ module Bundler
 
       path = bundle_path
       path = path.parent until path.exist?
-      sudo_present = !(`which sudo` rescue '').empty?
+      sudo_present = which "sudo"
       bin_dir = Pathname.new(Bundler.system_bindir)
       bin_dir = bin_dir.parent until bin_dir.exist?
 
@@ -246,6 +246,17 @@ module Bundler
       end
     end
 
+    def which(binary)
+      if File.executable? binary
+        binary
+      else
+        path = ENV['PATH'].split(File::PATH_SEPARATOR).find { |path|
+          File.executable? File.join(path, binary)
+        }
+        path && File.expand_path(binary, path)
+      end
+    end
+
     def sudo(str)
       `sudo -p 'Enter your password to install the bundled RubyGems to your system: ' #{str}`
     end