Land #6633, install bundler on msfupdate conditionally
commit
8b32f22a17
|
@ -185,7 +185,14 @@ class Msfupdate
|
||||||
system("git", "merge", "#{remote}/#{branch}")
|
system("git", "merge", "#{remote}/#{branch}")
|
||||||
|
|
||||||
stdout.puts "[*] Updating gems..."
|
stdout.puts "[*] Updating gems..."
|
||||||
require 'bundler'
|
begin
|
||||||
|
require 'bundler'
|
||||||
|
rescue LoadError
|
||||||
|
stderr.puts '[*] Installing bundler'
|
||||||
|
system('gem', 'install', 'bundler')
|
||||||
|
Gem.clear_paths
|
||||||
|
require 'bundler'
|
||||||
|
end
|
||||||
Bundler.with_clean_env do
|
Bundler.with_clean_env do
|
||||||
system("bundle", "install")
|
system("bundle", "install")
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue