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']
|
unless ENV['BUNDLE_GEMFILE']
|
||||||
require 'pathname'
|
require 'pathname'
|
||||||
|
|
||||||
msfenv_real_pathname = Pathname.new(__FILE__).realpath
|
|
||||||
root = msfenv_real_pathname.parent.parent
|
|
||||||
|
|
||||||
GEMFILE_EXTENSIONS.each do |extension|
|
GEMFILE_EXTENSIONS.each do |extension|
|
||||||
extension_pathname = root.join("Gemfile#{extension}")
|
extension_pathname = root.join("Gemfile#{extension}")
|
||||||
|
|
||||||
|
@ -22,7 +22,6 @@ unless ENV['BUNDLE_GEMFILE']
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
begin
|
begin
|
||||||
require 'bundler'
|
require 'bundler'
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
|
@ -31,7 +30,6 @@ rescue LoadError
|
||||||
exit(0)
|
exit(0)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
Bundler.setup
|
Bundler.setup
|
||||||
|
|
||||||
lib_path = root.join('lib').to_path
|
lib_path = root.join('lib').to_path
|
||||||
|
|
Loading…
Reference in New Issue