ec2-ami-tools: drop AmazonWebServicesFormula

1 files changed, 21 insertions, 4 deletions

diff --git a/Library/Formula/ec2-ami-tools.rb b/Library/Formula/ec2-ami-tools.rb
index 132d2472d..4f73f1f23 100644
--- a/Library/Formula/ec2-ami-tools.rb
+++ b/Library/Formula/ec2-ami-tools.rb
@@ -1,15 +1,32 @@
-class Ec2AmiTools < AmazonWebServicesFormula
+class Ec2AmiTools < Formula
   homepage "https://aws.amazon.com/developertools/368"
   url "https://ec2-downloads.s3.amazonaws.com/ec2-ami-tools-1.5.6.zip"
   sha1 "cb1a0e807e6e4e473a5a462633cb9990ec851093"
 
+  depends_on :java
+
+  def install
+    env = Language::Java.java_home_env.merge(:EC2_AMITOOL_HOME => libexec)
+    rm Dir["bin/*.cmd"] # Remove Windows versions
+    libexec.install Dir["*"]
+    Pathname.glob("#{libexec}/bin/*") do |file|
+      next if file.directory?
+      basename = file.basename
+      next if basename.to_s == "service"
+      (bin/basename).write_env_script file, env
+    end
+  end
+
   def caveats
-    standard_instructions "EC2_AMITOOL_HOME"
+    <<-EOS.undent
+      Before you can use these tools you must export some variables to your $SHELL.
+        export AWS_ACCESS_KEY="<Your AWS Access ID>"
+        export AWS_SECRET_KEY="<Your AWS Secret Key>"
+        export AWS_CREDENTIAL_FILE="<Path to the credentials file>"
+    EOS
   end
 
   test do
-    ENV["JAVA_HOME"] = `/usr/libexec/java_home`.chomp
-    ENV["EC2_AMITOOL_HOME"] = libexec
     assert_match version.to_s, shell_output("#{bin}/ec2-ami-tools-version")
   end
 end