Get rid of compat_resource and mariadb
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
# Cookbook:: homebrew
|
||||
# Recipe:: default
|
||||
#
|
||||
# Copyright:: 2011-2016, Chef Software, Inc.
|
||||
# Copyright:: 2011-2019, Chef Software, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -19,29 +19,50 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
homebrew_go = "#{Chef::Config[:file_cache_path]}/homebrew_go"
|
||||
unless Homebrew.exist?
|
||||
homebrew_go = "#{Chef::Config[:file_cache_path]}/homebrew_go"
|
||||
|
||||
Chef::Log.debug("Homebrew owner is '#{homebrew_owner}'")
|
||||
# Grant Homebrew install script permission to execute
|
||||
# without passing a sudo password. Deletes itself at
|
||||
# the end of a successful run.
|
||||
sudo 'nopasswd_homebrew_installer' do
|
||||
user Homebrew.owner
|
||||
commands [
|
||||
homebrew_go,
|
||||
'/bin/chmod',
|
||||
'/bin/mkdir',
|
||||
'/bin/rm',
|
||||
'/usr/bin/chgrp',
|
||||
'/usr/bin/install',
|
||||
'/usr/bin/touch',
|
||||
'/usr/bin/xcode-select',
|
||||
'/usr/sbin/chown',
|
||||
'/usr/sbin/softwareupdate',
|
||||
]
|
||||
nopasswd true
|
||||
action :create
|
||||
notifies :delete, 'sudo[nopasswd_homebrew_installer]', :delayed
|
||||
end
|
||||
|
||||
remote_file homebrew_go do
|
||||
source node['homebrew']['installer']['url']
|
||||
checksum node['homebrew']['installer']['checksum'] unless node['homebrew']['installer']['checksum'].nil?
|
||||
mode '755'
|
||||
not_if { ::File.exist? '/usr/local/bin/brew' }
|
||||
end
|
||||
remote_file homebrew_go do
|
||||
source node['homebrew']['installer']['url']
|
||||
checksum node['homebrew']['installer']['checksum'] unless node['homebrew']['installer']['checksum'].nil?
|
||||
mode '0755'
|
||||
retries 2
|
||||
end
|
||||
|
||||
execute 'install homebrew' do
|
||||
command homebrew_go
|
||||
environment lazy { { 'HOME' => ::Dir.home(homebrew_owner), 'USER' => homebrew_owner } }
|
||||
user homebrew_owner
|
||||
not_if { ::File.exist? '/usr/local/bin/brew' }
|
||||
execute 'install homebrew' do
|
||||
command homebrew_go
|
||||
environment lazy { { 'HOME' => ::Dir.home(Homebrew.owner), 'USER' => Homebrew.owner, 'NONINTERACTIVE' => '1' } }
|
||||
user Homebrew.owner
|
||||
end
|
||||
end
|
||||
|
||||
execute 'set analytics' do
|
||||
environment lazy { { 'HOME' => ::Dir.home(homebrew_owner), 'USER' => homebrew_owner } }
|
||||
user homebrew_owner
|
||||
command "/usr/local/bin/brew analytics #{node['homebrew']['enable-analytics'] ? 'on' : 'off'}"
|
||||
only_if { shell_out('/usr/local/bin/brew analytics state', user: homebrew_owner).stdout.include?('enabled') != node['homebrew']['enable-analytics'] }
|
||||
environment lazy { { 'HOME' => ::Dir.home(Homebrew.owner), 'USER' => Homebrew.owner } }
|
||||
user Homebrew.owner
|
||||
command lazy { "#{HomebrewWrapper.new.install_path}/bin/brew analytics #{node['homebrew']['enable-analytics'] ? 'on' : 'off'}" }
|
||||
only_if { shell_out("#{HomebrewWrapper.new.install_path}/bin/brew analytics state", user: Homebrew.owner).stdout.include?('enabled') != node['homebrew']['enable-analytics'] }
|
||||
end
|
||||
|
||||
if node['homebrew']['auto-update']
|
||||
@@ -50,8 +71,8 @@ if node['homebrew']['auto-update']
|
||||
end
|
||||
|
||||
execute 'update homebrew from github' do
|
||||
environment lazy { { 'HOME' => ::Dir.home(homebrew_owner), 'USER' => homebrew_owner } }
|
||||
user homebrew_owner
|
||||
command '/usr/local/bin/brew update || true'
|
||||
environment lazy { { 'HOME' => ::Dir.home(Homebrew.owner), 'USER' => Homebrew.owner } }
|
||||
user Homebrew.owner
|
||||
command lazy { "#{HomebrewWrapper.new.install_path}/bin/brew update || true" }
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user