summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2011-09-17 12:20:07 -0700
committerAndre Arko <andre@arko.net>2011-09-17 12:20:07 -0700
commitd758698c4eff5d13eabe33c8e62cbbfc19d648db (patch)
treebbff7ae1490fd1576b15bc30d9e0114775f69881
parent7a624ab4c77f9129b5e77407319c5413a93823f6 (diff)
downloadbundler-d758698c4eff5d13eabe33c8e62cbbfc19d648db.tar.gz
rescue interrupts while bundler is loading
closes #1395
-rwxr-xr-xbin/bundle18
1 files changed, 8 insertions, 10 deletions
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