diff options
| -rw-r--r-- | Library/Formula/aws-elasticache.rb | 7 | ||||
| -rw-r--r-- | Library/Formula/rds-command-line-tools.rb | 7 | ||||
| -rw-r--r-- | Library/Homebrew/formula_specialties.rb | 11 |
3 files changed, 8 insertions, 17 deletions
diff --git a/Library/Formula/aws-elasticache.rb b/Library/Formula/aws-elasticache.rb index 0cfa78e8c..f3e1f51e4 100644 --- a/Library/Formula/aws-elasticache.rb +++ b/Library/Formula/aws-elasticache.rb @@ -9,13 +9,10 @@ class AwsElasticache < AmazonWebServicesFormula depends_on 'ec2-api-tools' def install - rm Dir['bin/*.cmd'] # Remove Windows command files - libexec.install "bin", "lib" - bin.install_symlink Dir["#{libexec}/bin/*"] - (bin/'service').unlink # Don't keep this symlink + standard_install end def caveats - standard_instructions "AWS_ELASTICACHE_HOME", libexec + standard_instructions "AWS_ELASTICACHE_HOME" end end diff --git a/Library/Formula/rds-command-line-tools.rb b/Library/Formula/rds-command-line-tools.rb index d70b313af..dcab481e2 100644 --- a/Library/Formula/rds-command-line-tools.rb +++ b/Library/Formula/rds-command-line-tools.rb @@ -6,14 +6,11 @@ class RdsCommandLineTools < AmazonWebServicesFormula sha1 'd0853f066ba1dca699a4a1d91581e11e523ec83a' def install - rm Dir['bin/*.cmd'] # Remove Windows command files - libexec.install "bin", "lib" - bin.install_symlink Dir["#{libexec}/bin/*"] - (bin/'service').unlink # Don't keep this symlink + standard_install end def caveats - s = standard_instructions "AWS_RDS_HOME", libexec + s = standard_instructions "AWS_RDS_HOME" s += <<-EOS.undent To check that your setup works properly, run the following command: diff --git a/Library/Homebrew/formula_specialties.rb b/Library/Homebrew/formula_specialties.rb index 2529243b2..7bf7f65b3 100644 --- a/Library/Homebrew/formula_specialties.rb +++ b/Library/Homebrew/formula_specialties.rb @@ -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 |