From 21bb4fc06ff48eacc5211682d772f522d80a8d31 Mon Sep 17 00:00:00 2001 From: adfoster-r7 Date: Fri, 24 May 2024 00:30:52 +0100 Subject: [PATCH] Update gemspec to use require_relative --- metasploit-framework.gemspec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec index b0378e9b3b..7f70bfd8fc 100644 --- a/metasploit-framework.gemspec +++ b/metasploit-framework.gemspec @@ -4,17 +4,17 @@ # we must manually define the project root if ENV['MSF_ROOT'] lib = File.realpath(File.expand_path('lib', ENV['MSF_ROOT'])) + $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) + require 'metasploit/framework/version' + require 'metasploit/framework/rails_version_constraint' + require 'msf/util/helper' else - # 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__)) + # XXX: Use explicit calls to require_relative to ensure that static analysis tools such as dependabot work + require_relative 'lib/metasploit/framework/version' + require_relative 'lib/metasploit/framework/rails_version_constraint' + require_relative 'lib/msf/util/helper' end -$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'metasploit/framework/version' -require 'metasploit/framework/rails_version_constraint' -require 'msf/util/helper' - Gem::Specification.new do |spec| spec.name = 'metasploit-framework' spec.version = Metasploit::Framework::GEM_VERSION