diff options
| author | Jack Nagel | 2013-01-22 14:33:33 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-01-22 14:59:10 -0600 |
| commit | 21efd0803cc1eae9912fdd12bd5ed440959c75ff (patch) | |
| tree | f3a31dc287e631e9b97b47a064290de4e8af1607 /Library/Formula | |
| parent | 0d28b0566d69fdd6e08026099009ada77632dd21 (diff) | |
| download | homebrew-21efd0803cc1eae9912fdd12bd5ed440959c75ff.tar.bz2 | |
Infer path to be added for requirements that search PATH
When a requirement is specified like:
satisfy { which "foo" }
There is no reason that we should inject all of ENV.userpaths! into the
build environment. Instead, infer the directory to be added to PATH from
the Pathname that is returned.
This is another step towards condensing the "which program" requirements
down into a one-liner DSL element.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/rhash.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/shocco.rb | 1 | ||||
| -rw-r--r-- | Library/Formula/signing-party.rb | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/Library/Formula/rhash.rb b/Library/Formula/rhash.rb index 9bea1082a..32de2c134 100644 --- a/Library/Formula/rhash.rb +++ b/Library/Formula/rhash.rb @@ -3,7 +3,7 @@ require 'formula' class LionOrNewer < Requirement fatal true - satisfy(:build_env => false) { MacOS.version >= :lion } + satisfy MacOS.version >= :lion def message "rhash requires `wcsdup` which isn't in the SDK before Lion." diff --git a/Library/Formula/shocco.rb b/Library/Formula/shocco.rb index 572667344..81029c85a 100644 --- a/Library/Formula/shocco.rb +++ b/Library/Formula/shocco.rb @@ -10,7 +10,6 @@ end class MarkdownProvider < Requirement fatal true - env :userpaths satisfy { which 'markdown' } diff --git a/Library/Formula/signing-party.rb b/Library/Formula/signing-party.rb index 33c201055..cea84fbc9 100644 --- a/Library/Formula/signing-party.rb +++ b/Library/Formula/signing-party.rb @@ -2,7 +2,6 @@ require 'formula' class GnupgInstalled < Requirement fatal true - env :userpaths satisfy { which('gpg') || which('gpg2') } |