Pluralize arch as archs, not arches

This commit is contained in:
William Vu 2018-08-24 14:33:36 -05:00
parent 98aba35b29
commit 8d6d747aa0
1 changed files with 9 additions and 9 deletions

View File

@ -69,7 +69,7 @@ def parse_args(args)
opt.separator('')
opt.separator('Options:')
opt.on('-l', '--list <type>', Array, 'List all modules for [type]. Types are: payloads, encoders, nops, platforms, arches, encrypt, formats, all') do |l|
opt.on('-l', '--list <type>', Array, 'List all modules for [type]. Types are: payloads, encoders, nops, platforms, archs, encrypt, formats, all') do |l|
if l.to_s.empty?
l = ["all"]
end
@ -113,7 +113,7 @@ def parse_args(args)
opts[:encryption_iv] = e
end
opt.on('-a', '--arch <arch>', String, 'The architecture to use for --payload and --encoders (use --list arches to list)') do |a|
opt.on('-a', '--arch <arch>', String, 'The architecture to use for --payload and --encoders (use --list archs to list)') do |a|
opts[:arch] = a
end
@ -245,9 +245,9 @@ def dump_platforms
"\n" + tbl.to_s + "\n"
end
def dump_arches
def dump_archs
init_framework(:module_types => [])
supported_arches = ARCH_ALL.dup
supported_archs = ARCH_ALL.dup
tbl = Rex::Text::Table.new(
'Indent' => 4,
@ -257,7 +257,7 @@ def dump_arches
"Name",
])
supported_arches.sort.each do |name|
supported_archs.sort.each do |name|
tbl << [name]
end
@ -390,8 +390,8 @@ if generator_opts[:list]
$stdout.puts dump_nops
when "platforms", "dump_platform"
$stdout.puts dump_platforms
when "arches", "dump_arch"
$stdout.puts dump_arches
when "archs", "dump_arch"
$stdout.puts dump_archs
when "encrypts", "encrypt", "encryption"
$stdout.puts dump_encrypt
when "formats", "format", "f"
@ -404,11 +404,11 @@ if generator_opts[:list]
$stdout.puts dump_encoders
$stdout.puts dump_nops
$stdout.puts dump_platforms
$stdout.puts dump_arches
$stdout.puts dump_archs
$stdout.puts dump_encrypt
$stdout.puts dump_formats
else
$stderr.puts "Invalid type (#{mod}). These are valid: payloads, encoders, nops, platforms, arches, encrypt, formats, all"
$stderr.puts "Invalid type (#{mod}). These are valid: payloads, encoders, nops, platforms, archs, encrypt, formats, all"
end
end
exit(0)