Touchups to msfconsole command parsing

Move from -s to -x and use a semicolon.

lib/msf/ui/console/driver.rb

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

msfconsole

@@ -101,9 +101,9 @@ class OptsConsole
 				options['DisableBanner'] = true
 			end
 
-			opts.on("-s", "-s <string>", "Execute the specified string as console commands") do |s|
-				options['SCommands'] ||= []
-				options['SCommands'] += s.split('\n')
+			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 ""