dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update using the MSP updater if available

This commit is contained in:
HD Moore 2012-11-21 09:38:05 -06:00
parent 3e898b28b3
commit e1f35c501d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
msfupdate
View File

@ -28,6 +28,9 @@ if not (Process.uid == 0 or File.stat(msfbase).owned?)
$stderr.puts "Please run msfupdate as the same user who installed metasploit."
end
def is_pro
File.exists?(File.expand_path(File.join(@msfbase_dir, "..", "engine", "update.rb")))
end
def is_git
File.directory?(File.join(@msfbase_dir, ".git"))
@ -105,7 +108,7 @@ if is_git
# attempt to reapply them. If the user wants them back
# they can always git stash pop them, and that presumes
# they know what they're doing when they're editing local
# checkout, which presumes they're not using msfupdate
# checkout, which presumes they're not using msfupdate
# to begin with.
#
# Note, this requires at least user.name and user.email
@ -130,7 +133,12 @@ if is_git
system("git", "merge", "#{remote}/#{branch}")
end
unless is_svn || is_git
if is_pro
update_script = File.expand_path(File.join(@msfbase, "..", "engine", "update.rb"))
system("ruby", update_script)
end
unless is_svn || is_git || is_pro
raise RuntimeError, "Cannot determine checkout type: `#{@msfbase_dir}'"
end