mirror of
https://github.com/rapid7/metasploit-framework
synced 2024-08-28 23:26:18 +02:00
depend on regular rb-readline, bugs fixed upstream
This commit is contained in:
parent
99047fa8a1
commit
6a2d036ea8
@ -30,7 +30,7 @@ PATH
|
||||
pcaprub
|
||||
pg
|
||||
railties
|
||||
rb-readline-r7
|
||||
rb-readline
|
||||
recog
|
||||
redcarpet
|
||||
rex-arch (= 0.1.4)
|
||||
@ -233,7 +233,6 @@ GEM
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (12.0.0)
|
||||
rb-readline-r7 (0.5.2.0)
|
||||
recog (2.1.4)
|
||||
nokogiri
|
||||
redcarpet (3.4.0)
|
||||
|
@ -737,7 +737,7 @@ protected
|
||||
if opts['RealReadline']
|
||||
# Remove the gem version from load path to be sure we're getting the
|
||||
# stdlib readline.
|
||||
gem_dir = Gem::Specification.find_all_by_name('rb-readline-r7').first.gem_dir
|
||||
gem_dir = Gem::Specification.find_all_by_name('rb-readline').first.gem_dir
|
||||
rb_readline_path = File.join(gem_dir, "lib")
|
||||
index = $LOAD_PATH.index(rb_readline_path)
|
||||
# Bundler guarantees that the gem will be there, so it should be safe to
|
||||
|
@ -147,15 +147,8 @@ Gem::Specification.new do |spec|
|
||||
spec.add_runtime_dependency 'rex-encoder'
|
||||
# Library for exploit development helpers
|
||||
spec.add_runtime_dependency 'rex-exploitation'
|
||||
|
||||
# rb-readline doesn't work with Ruby Installer due to error with Fiddle:
|
||||
# NoMethodError undefined method `dlopen' for Fiddle:Module
|
||||
unless Gem.win_platform?
|
||||
# Command line editing, history, and tab completion in msfconsole
|
||||
# Use the Rapid7 fork until the official gem catches up
|
||||
spec.add_runtime_dependency 'rb-readline-r7'
|
||||
end
|
||||
|
||||
# Command line editing, history, and tab completion in msfconsole
|
||||
spec.add_runtime_dependency 'rb-readline'
|
||||
# Needed by anemone crawler
|
||||
spec.add_runtime_dependency 'robots'
|
||||
# Needed by some modules
|
||||
|
Loading…
Reference in New Issue
Block a user