Fix post/test/* modules' loadpath

Allows loading when pwd is not framework's install root
bug/bundler_fix
James Lee 2014-07-30 13:45:13 -05:00
parent 4ed085d0d2
commit 23b04c8ece
8 changed files with 22 additions and 16 deletions

View File

@ -2,7 +2,8 @@
require 'msf/core' require 'msf/core'
require 'rex' require 'rex'
$:.push "test/lib" unless $:.include? "test/lib" lib = File.join(Msf::Config.install_root, "test", "lib")
$:.push(lib) unless $:.include?(lib)
require 'module_test' require 'module_test'
class Metasploit4 < Msf::Post class Metasploit4 < Msf::Post

View File

@ -1,5 +1,7 @@
require 'msf/core'
$:.push "test/lib" unless $:.include? "test/lib" lib = File.join(Msf::Config.install_root, "test", "lib")
$:.push(lib) unless $:.include?(lib)
require 'module_test' require 'module_test'
#load 'test/lib/module_test.rb' #load 'test/lib/module_test.rb'

View File

@ -1,5 +1,6 @@
require 'msf/core'
$:.push "test/lib" unless $:.include? "test/lib" lib = File.join(Msf::Config.install_root, "test", "lib")
require 'module_test' require 'module_test'
#load 'test/lib/module_test.rb' #load 'test/lib/module_test.rb'

View File

@ -2,7 +2,8 @@
require 'msf/core' require 'msf/core'
require 'rex' require 'rex'
$:.push "test/lib" unless $:.include? "test/lib" lib = File.join(Msf::Config.install_root, "test", "lib")
$:.push(lib) unless $:.include?(lib)
require 'module_test' require 'module_test'
class Metasploit4 < Msf::Post class Metasploit4 < Msf::Post

View File

@ -1,16 +1,15 @@
## ##
# This file is part of the Metasploit Framework and may be subject to # This module requires Metasploit: http//metasploit.com/download
# redistribution and commercial restrictions. Please see the Metasploit # Current source: https://github.com/rapid7/metasploit-framework
# Framework web site for more information on licensing and terms of use.
# http://metasploit.com/framework/
## ##
require 'msf/core' require 'msf/core'
require 'rex' require 'rex'
require 'msf/core/post/windows/railgun' require 'msf/core/post/windows/railgun'
$:.push "test/lib" unless $:.include? "test/lib" lib = File.join(Msf::Config.install_root, "test", "lib")
$:.push(lib) unless $:.include?(lib)
require 'module_test' require 'module_test'
class Metasploit3 < Msf::Post class Metasploit3 < Msf::Post

View File

@ -1,16 +1,15 @@
## ##
# This file is part of the Metasploit Framework and may be subject to # This module requires Metasploit: http//metasploit.com/download
# redistribution and commercial restrictions. Please see the Metasploit # Current source: https://github.com/rapid7/metasploit-framework
# Framework web site for more information on licensing and terms of use.
# http://metasploit.com/framework/
## ##
require 'msf/core' require 'msf/core'
require 'rex' require 'rex'
require 'msf/core/post/windows/registry' require 'msf/core/post/windows/registry'
$:.push "test/lib" unless $:.include? "test/lib" lib = File.join(Msf::Config.install_root, "test", "lib")
$:.push(lib) unless $:.include?(lib)
require 'module_test' require 'module_test'
class Metasploit3 < Msf::Post class Metasploit3 < Msf::Post

View File

@ -6,7 +6,8 @@ require 'msf/core'
require 'rex' require 'rex'
require 'msf/core/post/windows/services' require 'msf/core/post/windows/services'
$:.push "test/lib" unless $:.include? "test/lib" lib = File.join(Msf::Config.install_root, "test", "lib")
$:.push(lib) unless $:.include?(lib)
require 'module_test' require 'module_test'
class Metasploit3 < Msf::Post class Metasploit3 < Msf::Post

View File

@ -1,5 +1,7 @@
require 'msf/core'
$:.push "test/lib" unless $:.include? "test/lib" lib = File.join(Msf::Config.install_root, "test", "lib")
$:.push(lib) unless $:.include?(lib)
require 'module_test' require 'module_test'
#load 'test/lib/module_test.rb' #load 'test/lib/module_test.rb'