Permalink
Browse files

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.
  • Loading branch information...
1 parent 49352be commit 6ea6488a09d33b70d9c37cd8af8c9f49eb7ff6fc Karsten Sperling committed May 4, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 Library/Homebrew/formula_specialties.rb
View
6 Library/Homebrew/formula_specialties.rb
@@ -30,7 +30,7 @@ def standard_install
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 @@ def standard_instructions var_name, var_value=prefix+'jars'
* 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

0 comments on commit 6ea6488

Please sign in to comment.