diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-03-30 16:21:01 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-04-02 12:27:19 -0700 |
| commit | a260b91298d4f2b692e8c7fc0e57c833ee7b32a0 (patch) | |
| tree | 627404e569d940d1c1f9ea1ff67dcbe90b0d1889 | |
| parent | 9d7a0231dc7954e844f31cbe2370eb69ce43a12d (diff) | |
| download | chef-a260b91298d4f2b692e8c7fc0e57c833ee7b32a0.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 caab7cb7e5..10ff24ca9d 100644 --- a/lib/chef/resource/build_essential.rb +++ b/lib/chef/resource/build_essential.rb @@ -72,14 +72,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 |