diff options
| author | Jack Nagel | 2013-08-19 12:32:56 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-08-19 12:32:56 -0500 |
| commit | 84a00aa7972cbccd0722ee686a97e3d55fad5fd6 (patch) | |
| tree | 6dc35114694cbde18bb20448c0ec0816aaf36d10 /Library/Homebrew/cmd | |
| parent | b4a5fb4d3ad01d3570ad1bc575f4bc347c4e71a3 (diff) | |
| download | homebrew-84a00aa7972cbccd0722ee686a97e3d55fad5fd6.tar.bz2 | |
Make Superenv activation explicit
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/--env.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/sh.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Library/Homebrew/cmd/--env.rb b/Library/Homebrew/cmd/--env.rb index 16d035a03..8cc1b1b40 100644 --- a/Library/Homebrew/cmd/--env.rb +++ b/Library/Homebrew/cmd/--env.rb @@ -3,6 +3,8 @@ require 'hardware' module Homebrew extend self def __env + ENV.activate_extensions! + if superenv? ENV.deps = ARGV.formulae.map(&:name) unless ARGV.named.empty? end diff --git a/Library/Homebrew/cmd/sh.rb b/Library/Homebrew/cmd/sh.rb index 956cc4ecd..5e8f26580 100644 --- a/Library/Homebrew/cmd/sh.rb +++ b/Library/Homebrew/cmd/sh.rb @@ -3,6 +3,8 @@ require 'formula' module Homebrew extend self def sh + ENV.activate_extensions! + if superenv? ENV.x11 = true ENV.deps = Formula.installed.select{|f| f.keg_only? and f.opt_prefix.directory? }.map(&:name) |
