From 64cb52ef3e4e45946678a9c6647527a94369953d Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 25 Nov 2016 16:44:30 +0000 Subject: [PATCH 1/2] Revert "Merge pull request #1567 from cesarandreu/fix-diagnostic-conditonal" This reverts commit 89c3348923c3450d8d32f1252abd53209b39c288, reversing changes made to 7f13b37b903564e2a64cea982d6b84d1aa6b800b. --- Library/Homebrew/diagnostic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index b5dd07ac5b..edade67bf6 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -1071,7 +1071,7 @@ module Homebrew def check_for_member_of_admin_group groups = Utils.popen_read("groups").split - return if groups.include?("admin") + return unless groups.include?("admin") <<-EOS.undent You are not a member of the "admin" group, which will cause From 771ae5c528385ceb80009b0b5fe37e3b481394a9 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 25 Nov 2016 16:44:33 +0000 Subject: [PATCH 2/2] Revert "Merge pull request #1562 from woodruffw/check-admin-group" This reverts commit 7f13b37b903564e2a64cea982d6b84d1aa6b800b, reversing changes made to 62e0ecdaafbc6779205908c7ab191c884473afd6. --- Library/Homebrew/diagnostic.rb | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index edade67bf6..19148a6ae2 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -1069,19 +1069,6 @@ module Homebrew message end - def check_for_member_of_admin_group - groups = Utils.popen_read("groups").split - return unless groups.include?("admin") - - <<-EOS.undent - You are not a member of the "admin" group, which will cause - commands like `brew linkapps` to fail. - - To fix this, you can run: - `sudo dseditgroup -o edit -a $(whoami) -t user admin` - EOS - end - def all methods.map(&:to_s).grep(/^check_/) end