From 722a5af4ebf68adb9fc3d2e828d054e228dcf5f0 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 22 Apr 2014 15:35:54 -0500 Subject: [PATCH] Simplify conditions for superenv activation `MacOS::Xcode.without_clt? && MacOS.sdk_path.nil?` should never be true. In its earliest form, this would raise a bare RuntimeError in an effort to have the bug reported. Later, it was changed to silently disable superenv. But we don't want to do that. If there's a bug, or the user's system is misconfigured, we want to know, so that we can fix the bug, or the user can fix their system. So let's remove the condition. --- Library/Homebrew/extend/ENV.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index dccf5c4f82..85aa23ebee 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -4,10 +4,7 @@ require 'extend/ENV/std' require 'extend/ENV/super' def superenv? - return false if MacOS::Xcode.without_clt? && MacOS.sdk_path.nil? - return false unless Superenv.bin && Superenv.bin.directory? - return false if ARGV.env == "std" - true + Superenv.bin && Superenv.bin.directory? && ARGV.env != "std" end module EnvActivation