From d758698c4eff5d13eabe33c8e62cbbfc19d648db Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Sat, 17 Sep 2011 12:20:07 -0700
Subject: rescue interrupts while bundler is loading

closes #1395
---
 bin/bundle | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'bin')

diff --git a/bin/bundle b/bin/bundle
index 778c79c36c..b6adbed50d 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,15 +1,13 @@
 #!/usr/bin/env ruby
-
-# Check if an older version of bundler is installed
-require 'bundler'
-$:.each do |path|
-  if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
-    abort "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`."
-  end
-end
-require 'bundler/cli'
-
 begin
+  require 'bundler'
+  # Check if an older version of bundler is installed
+  $:.each do |path|
+    if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
+      abort "Please remove 0.8 versions of bundler. This can be done by running `gem cleanup bundler`."
+    end
+  end
+  require 'bundler/cli'
   Bundler::CLI.start
 rescue Bundler::BundlerError => e
   Bundler.ui.error e.message
-- 
cgit v1.2.1