Touchups to msfconsole command parsing

Move from -s to -x and use a semicolon.
bug/bundler_fix
Tod Beardsley 2012-09-20 13:34:29 -05:00
parent d7727c880a
commit 1f90130475
2 changed files with 5 additions and 5 deletions

View File

@ -251,8 +251,8 @@ class Driver < Msf::Ui::Driver
end end
# Process any additional startup commands # Process any additional startup commands
if opts['SCommands'] and opts['SCommands'].kind_of? Array if opts['XCommands'] and opts['XCommands'].kind_of? Array
opts['SCommands'].each { |c| opts['XCommands'].each { |c|
run_single(c) run_single(c)
} }
end end

View File

@ -101,9 +101,9 @@ class OptsConsole
options['DisableBanner'] = true options['DisableBanner'] = true
end end
opts.on("-s", "-s <string>", "Execute the specified string as console commands") do |s| opts.on("-x", "-x <command>", "Execute the specified string as console commands (use ; for multiples)") do |s|
options['SCommands'] ||= [] options['XCommands'] ||= []
options['SCommands'] += s.split('\n') options['XCommands'] += s.split(/\s*;\s*/)
end end
opts.separator "" opts.separator ""