Define install instead of making subclasses call standard_install

9 files changed, 2 insertions, 33 deletions

diff --git a/Library/Formula/auto-scaling.rb b/Library/Formula/auto-scaling.rb
index bb7cd855b..f776ba67d 100644
--- a/Library/Formula/auto-scaling.rb
+++ b/Library/Formula/auto-scaling.rb
@@ -6,10 +6,6 @@ class AutoScaling < AmazonWebServicesFormula
   version  '1.0.61.6'
   sha1 '2e3aaaa2567f4dcafcedbfc05678270ab02ed341'
 
-  def install
-    standard_install
-  end
-
   def caveats
     <<-EOS.undent
       Before you can use these tools you must populate a file and export some variables to your $SHELL.
diff --git a/Library/Formula/aws-cfn-tools.rb b/Library/Formula/aws-cfn-tools.rb
index 911e7a30d..82f7e0790 100644
--- a/Library/Formula/aws-cfn-tools.rb
+++ b/Library/Formula/aws-cfn-tools.rb
@@ -8,10 +8,6 @@ class AwsCfnTools < AmazonWebServicesFormula
 
   depends_on 'ec2-api-tools'
 
-  def install
-    standard_install
-  end
-
   def caveats
     s = standard_instructions "AWS_CLOUDFORMATION_HOME"
     s += <<-EOS.undent
diff --git a/Library/Formula/aws-elasticache.rb b/Library/Formula/aws-elasticache.rb
index f3e1f51e4..546630e0f 100644
--- a/Library/Formula/aws-elasticache.rb
+++ b/Library/Formula/aws-elasticache.rb
@@ -8,10 +8,6 @@ class AwsElasticache < AmazonWebServicesFormula
 
   depends_on 'ec2-api-tools'
 
-  def install
-    standard_install
-  end
-
   def caveats
     standard_instructions "AWS_ELASTICACHE_HOME"
   end
diff --git a/Library/Formula/cloud-watch.rb b/Library/Formula/cloud-watch.rb
index 9d1d05ed1..e3781f09b 100644
--- a/Library/Formula/cloud-watch.rb
+++ b/Library/Formula/cloud-watch.rb
@@ -6,10 +6,6 @@ class CloudWatch < AmazonWebServicesFormula
   version '1.0.20.0'
   sha1 'c3f5b856b3ff8e1ae06d0ad5db5dd27c214c4881'
 
-  def install
-    standard_install
-  end
-
   def caveats
     s = standard_instructions "AWS_CLOUDWATCH_HOME"
     s += <<-EOS.undent
diff --git a/Library/Formula/ec2-ami-tools.rb b/Library/Formula/ec2-ami-tools.rb
index ef1552e0f..15cad5775 100644
--- a/Library/Formula/ec2-ami-tools.rb
+++ b/Library/Formula/ec2-ami-tools.rb
@@ -5,10 +5,6 @@ class Ec2AmiTools < AmazonWebServicesFormula
   url 'http://ec2-downloads.s3.amazonaws.com/ec2-ami-tools-1.5.3.zip'
   sha1 'a12a4b4cb9d602e70a51dcf0daad35b412828e4e'
 
-  def install
-    standard_install
-  end
-
   def caveats
     standard_instructions "EC2_AMITOOL_HOME"
   end
diff --git a/Library/Formula/ec2-api-tools.rb b/Library/Formula/ec2-api-tools.rb
index 609b6e954..3b64adc6c 100644
--- a/Library/Formula/ec2-api-tools.rb
+++ b/Library/Formula/ec2-api-tools.rb
@@ -5,10 +5,6 @@ class Ec2ApiTools < AmazonWebServicesFormula
   url 'http://ec2-downloads.s3.amazonaws.com/ec2-api-tools-1.7.1.0.zip'
   sha1 '154acfb5d117d0af1311c65030671cd56eb987aa'
 
-  def install
-    standard_install
-  end
-
   def caveats
     standard_instructions "EC2_HOME"
   end
diff --git a/Library/Formula/elb-tools.rb b/Library/Formula/elb-tools.rb
index b91a6025e..bcdef7409 100644
--- a/Library/Formula/elb-tools.rb
+++ b/Library/Formula/elb-tools.rb
@@ -8,10 +8,6 @@ class ElbTools < AmazonWebServicesFormula
 
   depends_on 'ec2-api-tools'
 
-  def install
-    standard_install
-  end
-
   def caveats
     standard_instructions "AWS_ELB_HOME"
   end
diff --git a/Library/Formula/rds-command-line-tools.rb b/Library/Formula/rds-command-line-tools.rb
index dcab481e2..239ade36a 100644
--- a/Library/Formula/rds-command-line-tools.rb
+++ b/Library/Formula/rds-command-line-tools.rb
@@ -5,10 +5,6 @@ class RdsCommandLineTools < AmazonWebServicesFormula
   url 'https://s3.amazonaws.com/rds-downloads/RDSCli-1.14.001.zip'
   sha1 'd0853f066ba1dca699a4a1d91581e11e523ec83a'
 
-  def install
-    standard_install
-  end
-
   def caveats
     s = standard_instructions "AWS_RDS_HOME"
     s += <<-EOS.undent
diff --git a/Library/Homebrew/formula_specialties.rb b/Library/Homebrew/formula_specialties.rb
index 179f591e3..96673fdea 100644
--- a/Library/Homebrew/formula_specialties.rb
+++ b/Library/Homebrew/formula_specialties.rb
@@ -20,11 +20,12 @@ end
 class AmazonWebServicesFormula < Formula
   # Use this method to peform a standard install for Java-based tools,
   # keeping the .jars out of HOMEBREW_PREFIX/lib
-  def standard_install
+  def install
     rm Dir['bin/*.cmd'] # Remove Windows versions
     libexec.install Dir['*']
     bin.install_symlink Dir["#{libexec}/bin/*"] - ["#{libexec}/bin/service"]
   end
+  alias_method :standard_install, :install
 
   # Use this method to generate standard caveats.
   def standard_instructions home_name, home_value=libexec