Merge branch 'master' of github.com:rapid7/metasploit-framework

bug/bundler_fix
sinn3r 2013-01-03 17:52:51 -06:00
commit 92e1604018
1 changed files with 9 additions and 5 deletions

14
msfgui
View File

@ -8,17 +8,21 @@
# $Revision$ # $Revision$
# #
msfbase = __FILE__
while File.symlink?(msfbase)
msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
end
$:.unshift(File.expand_path(File.join(File.dirname(msfbase), 'lib')))
require 'fastlib'
require 'msfenv'
begin begin
require 'msgpack' require 'msgpack'
rescue LoadError rescue LoadError
raise LoadError, "Missing msgpack gem, try 'gem install msgpack' to use MSFGui" raise LoadError, "Missing msgpack gem, try 'gem install msgpack' to use MSFGui"
end end
msfbase = __FILE__
while File.symlink?(msfbase)
msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
end
if RUBY_PLATFORM =~ /mswin|mingw/i if RUBY_PLATFORM =~ /mswin|mingw/i
exec "javaw -jar #{File.dirname(msfbase)}/data/gui/msfgui.jar" exec "javaw -jar #{File.dirname(msfbase)}/data/gui/msfgui.jar"
else else