From bf0e32901076c5397faf4fa34bbab263f3292440 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 19 Aug 2013 12:32:56 -0500 Subject: Make Superenv activation explicit --- Library/Homebrew/cmd/--env.rb | 2 ++ Library/Homebrew/cmd/sh.rb | 2 ++ 2 files changed, 4 insertions(+) (limited to 'Library/Homebrew/cmd') 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) -- cgit v1.2.3