infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging/electro-release' into feature/MSP-9707/smb-bruteforce-refactor

bug/bundler_fix
James Lee 2014-06-24 00:12:56 -05:00
parent ffd05d9da9 78e6c3a65b
commit 7615da7808
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/boot.rb
View File

@ -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