aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorJack Nagel2014-04-22 15:38:59 -0500
committerJack Nagel2014-04-22 15:39:59 -0500
commit6cdc76452b34b8dfe6c7c99a077183bf2d65ebee (patch)
tree3c7de4d167c7f40a18bd5cfc782adff620058831 /Library/Homebrew
parent722a5af4ebf68adb9fc3d2e828d054e228dcf5f0 (diff)
downloadbrew-6cdc76452b34b8dfe6c7c99a077183bf2d65ebee.tar.bz2
Only directories are candidates for superenv bin
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/extend/ENV.rb2
-rw-r--r--Library/Homebrew/extend/ENV/super.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 85aa23ebe..74c9a47f3 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 fd11371d6..14253ff88 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