diff options
| author | sowawa | 2014-01-15 19:05:20 +0900 |
|---|---|---|
| committer | Adam Vandenberg | 2014-03-04 20:27:34 -0800 |
| commit | ddf642466b5eeeeb313fc691274f04770ed3969c (patch) | |
| tree | 989fbd222fb29351a155c9bc860b14b92cc65c7b | |
| parent | dd5e0550cdecd91769ce7744a2b608ecd34863bb (diff) | |
| download | homebrew-ddf642466b5eeeeb313fc691274f04770ed3969c.tar.bz2 | |
Fix the bad value of EC2_HOME in the standard_instructions
Change EC2_HOME's value from 'export EC2_HOME="/usr/local/Cellar/ec2-api-tools/1.6.12.0/"'
to 'export EC2_HOME="/usr/local/Cellar/ec2-api-tools/1.6.12.0/libexec"'
Avoide the wrong value of EC_HOME caused by
024208466bfb4ffb479d48709caecc6a1e85ba4d
Closes #25918.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
| -rw-r--r-- | Library/Formula/ec2-api-tools.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula_specialties.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Library/Formula/ec2-api-tools.rb b/Library/Formula/ec2-api-tools.rb index 05d9c99a1..96dbaa943 100644 --- a/Library/Formula/ec2-api-tools.rb +++ b/Library/Formula/ec2-api-tools.rb @@ -10,6 +10,6 @@ class Ec2ApiTools < AmazonWebServicesFormula end def caveats - standard_instructions "EC2_HOME" + standard_instructions "EC2_HOME", prefix end end diff --git a/Library/Homebrew/formula_specialties.rb b/Library/Homebrew/formula_specialties.rb index 7bf7f65b3..cdfd5cd66 100644 --- a/Library/Homebrew/formula_specialties.rb +++ b/Library/Homebrew/formula_specialties.rb @@ -28,7 +28,7 @@ class AmazonWebServicesFormula < Formula end # Use this method to generate standard caveats. - def standard_instructions home_name + def standard_instructions home_name, home_value=libexec <<-EOS.undent Before you can use these tools you must export some variables to your $SHELL and download your X.509 certificate and private key from Amazon Web Services. @@ -46,7 +46,7 @@ class AmazonWebServicesFormula < Formula export JAVA_HOME="$(/usr/libexec/java_home)" export EC2_PRIVATE_KEY="$(/bin/ls "$HOME"/.ec2/pk-*.pem | /usr/bin/head -1)" export EC2_CERT="$(/bin/ls "$HOME"/.ec2/cert-*.pem | /usr/bin/head -1)" - export #{home_name}="#{libexec}" + export #{home_name}="#{home_value}" EOS end end |