admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #6018 from iMichka/sudo2

Browse Source 
brew: remove sudo call
This commit is contained in:
Michka Popoff 2019-04-17 20:50:06 +02:00 committed by GitHub
commit f35f17ccf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/brew.rb
View File

@ -17,6 +17,16 @@ end
# Also define here so we can rescue regardless of location. # Also define here so we can rescue regardless of location.
class MissingEnvironmentVariables < RuntimeError; end class MissingEnvironmentVariables < RuntimeError; end
def create_tap(cmd, tap_name)
tap_commands = []
if cmd == "services"
brew_uid = HOMEBREW_BREW_FILE.stat.uid
tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] if Process.uid.zero? && !brew_uid.zero?
end
tap_commands += %W[#{HOMEBREW_BREW_FILE} tap #{tap_name}]
safe_system(*tap_commands)
end
begin begin
require_relative "global" require_relative "global"
rescue MissingEnvironmentVariables => e rescue MissingEnvironmentVariables => e
@ -111,13 +121,9 @@ begin
odie "Unknown command: #{cmd}" if !possible_tap || possible_tap.installed? odie "Unknown command: #{cmd}" if !possible_tap || possible_tap.installed?
brew_uid = HOMEBREW_BREW_FILE.stat.uid
tap_commands = []
tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] if Process.uid.zero? && !brew_uid.zero?
# Unset HOMEBREW_HELP to avoid confusing the tap # Unset HOMEBREW_HELP to avoid confusing the tap
ENV.delete("HOMEBREW_HELP") if help_flag ENV.delete("HOMEBREW_HELP") if help_flag
tap_commands += %W[#{HOMEBREW_BREW_FILE} tap #{possible_tap}] create_tap(cmd, possible_tap.name)
safe_system(*tap_commands)
ENV["HOMEBREW_HELP"] = "1" if help_flag ENV["HOMEBREW_HELP"] = "1" if help_flag
exec HOMEBREW_BREW_FILE, cmd, *ARGV exec HOMEBREW_BREW_FILE, cmd, *ARGV
end end