diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-03-30 16:21:01 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-03-31 10:51:50 -0700 |
| commit | 30ca2271ba0d247bb13817884fc2dcd7d115d5d0 (patch) | |
| tree | 94893f2b85705948fe33d54f101494b8ca2813b1 | |
| parent | 168b6fb9ec1b749026cbbc7f8c51e22129c2a934 (diff) | |
| download | chef-30ca2271ba0d247bb13817884fc2dcd7d115d5d0.tar.gz | |
Simplify the installation a bit
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/resource/build_essential.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/chef/resource/build_essential.rb b/lib/chef/resource/build_essential.rb index 0d48d42062..90a7bf887a 100644 --- a/lib/chef/resource/build_essential.rb +++ b/lib/chef/resource/build_essential.rb @@ -66,14 +66,12 @@ class Chef # 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.gsub(/^ {14}/, "") + command <<-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 - # find the CLI Tools update. We tail here because sometimes there's 2 and newest is last - PROD=#{update_pkg_label} # install it - softwareupdate -i "$PROD" --verbose + softwareupdate -i "#{update_pkg_label}" --verbose # Remove the placeholder to prevent perpetual appearance in the update utility rm -f /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress EOH |