Revert "Land #8090, support rails usage of spec files list"

Another approach is needed here.
This reverts commit 82073020ef.
This reverts commit b55ee87e2d.
bug/bundler_fix
Jeffrey Martin 2017-03-11 22:13:16 -06:00
parent 8b7125e263
commit 437cba84b0
No known key found for this signature in database
GPG Key ID: 0CD9BBC2AF15F171
1 changed files with 7 additions and 9 deletions

View File

@ -2,16 +2,12 @@
# During build, the Gemfile is temporarily moved and
# we must manually define the project root
if ENV['MSF_ROOT'] || ENV['RAILS_ENV']
if ENV['MSF_ROOT']
lib = File.realpath(File.expand_path('lib', ENV['MSF_ROOT']))
files = `git ls-files`.split($/).reject { |file|
file =~ /^documentation|^data\/gui|^external/
}
else
# have to use realpath as metasploit-framework is often loaded through a
# symlink and tools like Coverage and debuggers require realpaths.
# have to use realpath as metasploit-framework is often loaded through a symlink and tools like Coverage and debuggers
# require realpaths.
lib = File.realpath(File.expand_path('../lib', __FILE__))
files = []
end
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@ -28,8 +24,10 @@ Gem::Specification.new do |spec|
spec.homepage = 'https://www.metasploit.com'
spec.license = 'BSD-3-clause'
spec.files = files
spec.bindir = '.'
spec.files = `git ls-files`.split($/).reject { |file|
file =~ /^documentation|^data\/gui|^external/
}
spec.bindir = '.'
if ENV['CREATE_BINSTUBS']
spec.executables = [
'msfconsole',