Merge pull request rapid7#886 from todb-r7/fix-msfupdate

Fix msfupdate for rapid7#7297

Author: HD Moore

msfupdate

@@ -28,18 +28,27 @@ end
 
 @args.each_with_index do |arg,i|
 	case arg
-	when "wait"
+	# Handle the old wait/nowait argument behavior
+	when "wait", "nowait"
 		@wait_index = i
-	when /--config-dir/
+		@actually_wait = (arg == "wait")
+	# An empty or absent config-dir means a default config-dir
+	when "--config-dir"
+		@configdir_index = i
+	# A defined config dir means a defined config-dir
+	when /--config-dir=(.*)?/
 		# Spaces in the directory should be fine since this whole thing is passed
 		# as a single argument via the multi-arg syntax for system() below.
 		# TODO: Test this spaces business. I don't buy it. -todb
+		@configdir = $1
 		@configdir_index = i
 	end
 end
 
-@args.delete_at @wait_index if @wait_index
-@args.push("--config-dir=#{@configdir}") unless @configdir_index
+@args[@wait_index] = nil      if @wait_index
+@args[@configdir_index] = nil if @configdir_index
+@args = @args.compact
+@args.push("--config-dir=#{@configdir}")
 @args.push("--non-interactive")
 
 res = system("svn", "cleanup")
@@ -54,7 +63,7 @@ else
 	system("svn", "update", *@args)
 end
 
-if @wait_index
+if @actually_wait
 	$stderr.puts ""
 	$stderr.puts "[*] Please hit enter to exit"
 	$stderr.puts ""