backcompat for 3-arg version of appbundler

3-arg version is for omnibus-chef (and probably everything else)

4-arg version is for omnibus-chefdk (and supports the transitive gemfile
locking that we need in order to decouple the test gems across all the
tools in that project).
Signed-off-by: default avatarLamont Granquist <lamont@scriptkiddie.org>
parent aa047be8
......@@ -376,7 +376,6 @@ module Omnibus
build_commands << BuildCommand.new("appbundle `#{software_name}'") do
bin_dir = "#{install_dir}/bin"
appbundler_bin = embedded_bin("appbundler")
gem ||= software_name
lockdir ||=
begin
......@@ -389,7 +388,8 @@ module Omnibus
app_software.project_dir
end
command = [ appbundler_bin, "'#{lockdir}'", "'#{bin_dir}'", "'#{gem}'" ]
command = [ appbundler_bin, "'#{lockdir}'", "'#{bin_dir}'" ]
command << [ "'#{gem}'" ] if gem
command << [ "--without", without.join(",") ] unless without.nil?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment