summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/macos.rb2
-rw-r--r--lib/chef/resource/build_essential.rb4
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