Skip to content

Commit

Permalink
test4
Browse files Browse the repository at this point in the history
Signed-off-by: Corey Hemminger <[email protected]>
  • Loading branch information
Stromweld committed Jan 20, 2025
1 parent 4ecdb9c commit 1460668
Showing 1 changed file with 16 additions and 13 deletions.
29 changes: 16 additions & 13 deletions libraries/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,23 @@
# limitations under the License.
#

class HomebrewUserWrapper
require 'chef/mixin/homebrew'
include Chef::Mixin::Homebrew
# require Chef::VERSION >= Chef::Version.new('18.6.2') ? 'chef/mixin/homebrew' : 'chef/mixin/homebrew_user'
# include Chef::VERSION >= Chef::Version.new('18.6.2') ? Chef::Mixin::Homebrew : Chef::Mixin::HomebrewUser
include Chef::Mixin::Which
end
# class HomebrewUserWrapper
# require 'chef/mixin/homebrew'
# include Chef::Mixin::Homebrew
# # require Chef::VERSION >= Chef::Version.new('18.6.2') ? 'chef/mixin/homebrew' : 'chef/mixin/homebrew_user'
# # include Chef::VERSION >= Chef::Version.new('18.6.2') ? Chef::Mixin::Homebrew : Chef::Mixin::HomebrewUser
# include Chef::Mixin::Which
# end

module Homebrew
extend self
require 'chef/mixin/homebrew'
include Chef::Mixin::Homebrew

require 'mixlib/shellout'
include Chef::Mixin::ShellOut

def self.included(base)
base.extend(Homebrew)
base.extend(HomebrewHelper)
end

def install_path
Expand Down Expand Up @@ -70,6 +71,8 @@ def owner
end
end

extend self

private

def calculate_owner
Expand All @@ -93,8 +96,8 @@ def sudo_user
def current_user
ENV['USER']
end
end unless defined?(Homebrew)
end # unless defined?(Homebrew)

class HomebrewWrapper
include Homebrew
end
# class HomebrewWrapper
# include Homebrew
# end

0 comments on commit 1460668

Please sign in to comment.