Fix merge error
While helping Dave Maloney port the changes from lib/msfenv.rb to config/boot.rb for the Gemfile.local support, I failed to notice that root was only defined in the unless block when it is needed no matter what.bug/bundler_fix
parent
35c0ef0c68
commit
78e6c3a65b
|
@ -6,12 +6,12 @@ GEMFILE_EXTENSIONS = [
|
|||
''
|
||||
]
|
||||
|
||||
msfenv_real_pathname = Pathname.new(__FILE__).realpath
|
||||
root = msfenv_real_pathname.parent.parent
|
||||
|
||||
unless ENV['BUNDLE_GEMFILE']
|
||||
require 'pathname'
|
||||
|
||||
msfenv_real_pathname = Pathname.new(__FILE__).realpath
|
||||
root = msfenv_real_pathname.parent.parent
|
||||
|
||||
GEMFILE_EXTENSIONS.each do |extension|
|
||||
extension_pathname = root.join("Gemfile#{extension}")
|
||||
|
||||
|
@ -22,7 +22,6 @@ unless ENV['BUNDLE_GEMFILE']
|
|||
end
|
||||
end
|
||||
|
||||
|
||||
begin
|
||||
require 'bundler'
|
||||
rescue LoadError
|
||||
|
@ -31,7 +30,6 @@ rescue LoadError
|
|||
exit(0)
|
||||
end
|
||||
|
||||
|
||||
Bundler.setup
|
||||
|
||||
lib_path = root.join('lib').to_path
|
||||
|
|
Loading…
Reference in New Issue