From 9158f68561d3a5b3d8d445563fa3f67117e76aca Mon Sep 17 00:00:00 2001 From: Karsten Sperling Date: Fri, 4 May 2012 18:52:46 +1200 Subject: Point AWS environment variables at LinkedKeg (rather than the version being installed) This avoids having to change the variable when a different version is linked. Also ensure the private key / cert variables point to only 1 file. Signed-off-by: Adam Vandenberg --- Library/Homebrew/formula_specialties.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Library/Homebrew') diff --git a/Library/Homebrew/formula_specialties.rb b/Library/Homebrew/formula_specialties.rb index 330b51c3e..6cae0887f 100644 --- a/Library/Homebrew/formula_specialties.rb +++ b/Library/Homebrew/formula_specialties.rb @@ -30,7 +30,7 @@ class AmazonWebServicesFormula < Formula end # Use this method to generate standard caveats. - def standard_instructions var_name, var_value=prefix+'jars' + def standard_instructions var_name, var_value=linked_keg+'jars' <<-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,8 +46,8 @@ class AmazonWebServicesFormula < Formula * On Zsh, add them to `~/.zprofile` instead. export JAVA_HOME="$(/usr/libexec/java_home)" - export EC2_PRIVATE_KEY="$(/bin/ls $HOME/.ec2/pk-*.pem)" - export EC2_CERT="$(/bin/ls $HOME/.ec2/cert-*.pem)" + 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 #{var_name}="#{var_value}" EOS end -- cgit v1.2.3