summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2013-07-03 12:54:58 -0700
committerAndre Arko <andre@arko.net>2013-07-03 12:54:58 -0700
commit83786c196eb675c843e9117c4ce0e41bc606cc13 (patch)
treec6fe91d6b95e018506db7e911cf177b716b84035 /bin
parentc93e2b88ffc1ef1b2cda2923f3b670b1b6ee1651 (diff)
downloadbundler-83786c196eb675c843e9117c4ce0e41bc606cc13.tar.gz
minor bundle bin cleanup
Diffstat (limited to 'bin')
-rwxr-xr-xbin/bundle13
1 files changed, 4 insertions, 9 deletions
diff --git a/bin/bundle b/bin/bundle
index fc2aca105a..a6088f83b7 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,7 +1,4 @@
#!/usr/bin/env ruby
-
-# Trap interrupts to quit cleanly. See
-# https://twitter.com/mitchellh/status/283014103189053442
Signal.trap("INT") { exit 1 }
require 'bundler'
@@ -16,10 +13,8 @@ $:.each do |path|
end
require 'bundler/cli'
+# Force Thor to raise exceptions so we can exit non-zero.
+ENV["THOR_DEBUG"] = "1"
+
require 'bundler/friendly_errors'
-Bundler.with_friendly_errors {
- # Set debug flag so we can rescue Thor::error's
- # and set the correct exit code.
- ENV["THOR_DEBUG"] = "1"
- Bundler::CLI.start
-}
+Bundler.with_friendly_errors { Bundler::CLI.start }