Merge remote branch 'kernelsmith/msfconsole-s'

lib/msf/ui/console/driver.rb

@@ -249,6 +249,13 @@ class Driver < Msf::Ui::Driver
 			# If the opt is nil here, we load ~/.msf3/msfconsole.rc
 			load_resource(opts['Resource'])
 		end
+
+		# Process any additional startup commands
+		if opts['XCommands'] and opts['XCommands'].kind_of? Array
+			opts['XCommands'].each { |c|
+				run_single(c)
+			}
+		end
 	end
 
 	#

msfconsole

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