From 6cdc76452b34b8dfe6c7c99a077183bf2d65ebee Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 22 Apr 2014 15:38:59 -0500 Subject: [PATCH] Only directories are candidates for superenv bin --- Library/Homebrew/extend/ENV.rb | 2 +- Library/Homebrew/extend/ENV/super.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 85aa23ebee..74c9a47f35 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -4,7 +4,7 @@ require 'extend/ENV/std' require 'extend/ENV/super' def superenv? - Superenv.bin && Superenv.bin.directory? && ARGV.env != "std" + Superenv.bin && ARGV.env != "std" end module EnvActivation diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index fd11371d6c..14253ff88c 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -40,7 +40,7 @@ module Superenv end def self.bin - @bin ||= (HOMEBREW_REPOSITORY/"Library/ENV").children.reject{|d| d.basename.to_s > MacOS::Xcode.version }.max + @bin ||= (HOMEBREW_REPOSITORY/"Library/ENV").subdirs.reject { |d| d.basename.to_s > MacOS::Xcode.version }.max end def reset