AWS tools: always install to libexec

Don't link jars into lib or service into bin.
This commit is contained in:
Adam Vandenberg 2013-11-15 23:57:07 -08:00
parent b1f8358fa8
commit d1cfd02e27

View File

@ -23,15 +23,12 @@ class AmazonWebServicesFormula < Formula
# keeping the .jars out of HOMEBREW_PREFIX/lib
def standard_install
rm Dir['bin/*.cmd'] # Remove Windows versions
prefix.install "bin"
# Put the .jars in prefix/jars/lib, which isn't linked to the Cellar
# This will prevent conflicts with other versions of these jars.
(prefix+'jars').install 'lib'
(prefix+'jars/bin').make_symlink '../bin'
libexec.install Dir['*']
bin.install_symlink Dir["#{libexec}/bin/*"] - ["#{libexec}/bin/service"]
end
# Use this method to generate standard caveats.
def standard_instructions var_name, var_value=linked_keg+'jars'
def standard_instructions home_name
<<-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.
@ -49,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 #{var_name}="#{var_value}"
export #{home_name}="#{libexec}"
EOS
end
end