diff options
Diffstat (limited to 'lib/bundler/vendored_thor.rb')
| -rw-r--r-- | lib/bundler/vendored_thor.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/bundler/vendored_thor.rb b/lib/bundler/vendored_thor.rb index a6434268..2426f0c4 100644 --- a/lib/bundler/vendored_thor.rb +++ b/lib/bundler/vendored_thor.rb @@ -1,8 +1,5 @@ -if defined?(Thor) - Bundler.ui.warn "Thor has already been required. " + - "This may cause Bundler to malfunction in unexpected ways." -end -vendor = File.expand_path('../vendor', __FILE__) -$:.unshift(vendor) unless $:.include?(vendor) +vendor = File.expand_path('../vendor/thor-0.19.1/lib', __FILE__) +loaded = $:.include?(vendor) +$:.unshift(vendor) unless loaded require 'thor' require 'thor/actions' |