diff options
| author | Adam Vandenberg | 2012-12-16 09:25:10 -0800 |
|---|---|---|
| committer | Adam Vandenberg | 2012-12-16 09:25:10 -0800 |
| commit | 17cda9bba0291af7bacac038153880ab79276b5c (patch) | |
| tree | 0ce94ce1013054974a9f19d78e194e76a60a65b8 | |
| parent | d031474a2c0754ea506df2210b9469f9c85562f4 (diff) | |
| download | homebrew-17cda9bba0291af7bacac038153880ab79276b5c.tar.bz2 | |
Install some AWS packages to libexec
To prevent conflicting service commands, install some AWS packages to libexec
and don't symlink in the service command.
Closes #16591.
| -rw-r--r-- | Library/Formula/aws-elasticache.rb | 7 | ||||
| -rw-r--r-- | Library/Formula/rds-command-line-tools.rb | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Library/Formula/aws-elasticache.rb b/Library/Formula/aws-elasticache.rb index 2cc2bc04b..ec762be95 100644 --- a/Library/Formula/aws-elasticache.rb +++ b/Library/Formula/aws-elasticache.rb @@ -9,10 +9,13 @@ class AwsElasticache < AmazonWebServicesFormula depends_on 'ec2-api-tools' def install - standard_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 end def caveats - standard_instructions "AWS_ELASTICACHE_HOME" + standard_instructions "AWS_ELASTICACHE_HOME", libexec end end diff --git a/Library/Formula/rds-command-line-tools.rb b/Library/Formula/rds-command-line-tools.rb index 240af76b8..af5f8a444 100644 --- a/Library/Formula/rds-command-line-tools.rb +++ b/Library/Formula/rds-command-line-tools.rb @@ -7,11 +7,14 @@ class RdsCommandLineTools < AmazonWebServicesFormula sha1 '668cd776e88f76084164811cb4cab3e6373009dc' def install - standard_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 end def caveats - s = standard_instructions "AWS_RDS_HOME" + s = standard_instructions "AWS_RDS_HOME", libexec s += <<-EOS.undent To check that your setup works properly, run the following command: |