Instance variables for semaphores and scope

unstable
Tod Beardsley 2012-10-01 13:10:58 -05:00
parent 2573814c9d
commit c7ecdfb98e
1 changed files with 7 additions and 10 deletions

View File

@ -23,27 +23,24 @@ if not (Process.uid == 0 or File.stat(msfbase).owned?)
$stderr.puts "Please run msfupdate as the same user who installed metasploit."
end
configdir = nil
wait_index = nil
@args.each_with_index do |arg,i|
case arg
when "wait"
wait_index = i
@wait_index = i
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 = File.join(File.dirname(msfbase), "data", "svn")
configdir_index = i
@configdir_index = i
@configdir = File.join(File.dirname(msfbase), "data", "svn")
end
end
@args.delete_at wait_index if wait_index
@args.delete_at configdir_index if configdir_index
@args.delete_at @wait_index if @wait_index
@args.delete_at @configdir_index if @configdir_index
@args.push("--non-interactive")
@args.push("--config-dir=#{configdir}") if configdir
@args.push("--config-dir=#{@configdir}") if @configdir_index
res = system("svn", "cleanup")
if res.nil?
@ -57,7 +54,7 @@ else
system("svn", "update", *@args)
end
if wait_index
if @wait_index
$stderr.puts ""
$stderr.puts "[*] Please hit enter to exit"
$stderr.puts ""