Support 1.8

1 files changed, 22 insertions, 7 deletions

diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb
index cca7287c4b..3458a2adda 100644
--- a/lib/bundler/gem_helper.rb
+++ b/lib/bundler/gem_helper.rb
@@ -192,13 +192,28 @@ module Bundler
       [outbuf, (status && status.exitstatus) || -1]
     end
 
-    def sh_with_status(cmd, &block)
-      Bundler.ui.debug(cmd)
-      SharedHelpers.chdir(base) do
-        outbuf = IO.popen(cmd, err: [:child, :out], &:read)
-        status = $?
-        block.call(outbuf) if status.success? && block
-        [outbuf, status]
+    if RUBY_VERSION >= "1.9"
+      def sh_with_status(cmd, &block)
+        Bundler.ui.debug(cmd)
+        SharedHelpers.chdir(base) do
+          outbuf = IO.popen(cmd, :err => [:child, :out], &:read)
+          status = $?
+          block.call(outbuf) if status.success? && block
+          [outbuf, status]
+        end
+      end
+    else
+      def sh_with_status(cmd, &block)
+        cmd = cmd.shelljoin if cmd.respond_to?(:shelljoin)
+        cmd += " 2>&1"
+        outbuf = String.new
+        Bundler.ui.debug(cmd)
+        SharedHelpers.chdir(base) do
+          outbuf = `#{cmd}`
+          status = $?
+          block.call(outbuf) if status.success? && block
+          [outbuf, status]
+        end
       end
     end