summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel E. Giddins <segiddins@segiddins.me>2015-05-17 17:06:58 -0700
committerSamuel E. Giddins <segiddins@segiddins.me>2015-05-17 17:06:58 -0700
commitbf576bd83cfafeb21fa56b9141f37eb33e558d60 (patch)
tree77a0b183a0cd90602a902d66597d2d0bd00db9e3
parentc6c74e59da641704149eb94608b63487e17d57bc (diff)
downloadbundler-seg-executable-cleanup.tar.gz
Clean up invocation of Bundler CLIseg-executable-cleanup
-rwxr-xr-xbin/bundle12
-rwxr-xr-xbin/bundler12
2 files changed, 2 insertions, 22 deletions
diff --git a/bin/bundle b/bin/bundle
index 89c823eae3..43da771776 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -3,19 +3,9 @@
# Exit cleanly from an early interrupt
Signal.trap("INT") { exit 1 }
-require 'bundler'
-# Check if an older version of bundler is installed
-$LOAD_PATH.each do |path|
- if path =~ %r'/bundler-0\.(\d+)' && $1.to_i < 9
- err = "Looks like you have a version of bundler that's older than 0.9.\n"
- err << "Please remove your old versions.\n"
- err << "An easy way to do this is by running `gem cleanup bundler`."
- abort(err)
- end
-end
-
require 'bundler/friendly_errors'
Bundler.with_friendly_errors do
+ require 'bundler'
require 'bundler/cli'
Bundler::CLI.start(ARGV, :debug => true)
end
diff --git a/bin/bundler b/bin/bundler
index 89c823eae3..43da771776 100755
--- a/bin/bundler
+++ b/bin/bundler
@@ -3,19 +3,9 @@
# Exit cleanly from an early interrupt
Signal.trap("INT") { exit 1 }
-require 'bundler'
-# Check if an older version of bundler is installed
-$LOAD_PATH.each do |path|
- if path =~ %r'/bundler-0\.(\d+)' && $1.to_i < 9
- err = "Looks like you have a version of bundler that's older than 0.9.\n"
- err << "Please remove your old versions.\n"
- err << "An easy way to do this is by running `gem cleanup bundler`."
- abort(err)
- end
-end
-
require 'bundler/friendly_errors'
Bundler.with_friendly_errors do
+ require 'bundler'
require 'bundler/cli'
Bundler::CLI.start(ARGV, :debug => true)
end