diff options
| author | Tim Smith <tsmith@chef.io> | 2020-07-02 10:22:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 10:22:12 -0700 |
| commit | 9c2a381b87938bf4053123db8d1683130259a514 (patch) | |
| tree | ee038ac45c3ce902f26234520fb7a268929827dd | |
| parent | 5d252bfe4fd028c809e931a3fe6d9c80333a6d0b (diff) | |
| parent | c02ec2548a18092df82f927790a4e78b1e310405 (diff) | |
| download | chef-9c2a381b87938bf4053123db8d1683130259a514.tar.gz | |
Merge pull request #10096 from chef/build_essential_mac_output
Use bash not execute in build_essential for better output
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/macos.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/build_essential.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb index 30b674620b..c6be1ef249 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb @@ -56,6 +56,8 @@ include_recipe "git" end end +build_essential + launchd "io.chef.testing.fake" do source "io.chef.testing.fake.plist" action "enable" diff --git a/lib/chef/resource/build_essential.rb b/lib/chef/resource/build_essential.rb index c83517fdfe..ad37d3924f 100644 --- a/lib/chef/resource/build_essential.rb +++ b/lib/chef/resource/build_essential.rb @@ -146,8 +146,8 @@ class Chef def install_xcode_cli_tools(label) # This script was graciously borrowed and modified from Tim Sutton's # osx-vm-templates at https://github.com/timsutton/osx-vm-templates/blob/b001475df54a9808d3d56d06e71b8fa3001fff42/scripts/xcode-cli-tools.sh - execute "install Xcode Command Line tools" do - command <<-EOH + bash "install Xcode Command Line Tools" do + code <<-EOH # create the placeholder file that's checked by CLI updates' .dist code # in Apple's SUS catalog touch /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress |