Update formulae for version 0.7

* Use new "url" features
* Use keg_only DSL
* Use "skip_clean :all" DSL
* Whitespace and style cleanups
* Make bash invocations less silly
* Use new man2-man8 helpers
* Remove "FileUtils." since it is included in Formula
* Use real names for deps instead of aliases
* ENV.x11 now updates path, so remove that from individual brews

1 files changed, 17 insertions, 19 deletions

diff --git a/Library/Formula/solr.rb b/Library/Formula/solr.rb
index c5ebd9db5..c74c883fd 100644
--- a/Library/Formula/solr.rb
+++ b/Library/Formula/solr.rb
@@ -1,33 +1,31 @@
 require 'formula'
 
-SOLR_START_SCRIPT = <<-end_script
-#!/bin/sh
-if [ -z "$1" ]; then
-  echo "Usage: $ solr path/to/config/dir"
-else 
-  cd %s/example && java -Dsolr.solr.home=$1 -jar start.jar
-fi
-end_script
-
 class Solr <Formula
   url 'http://apache.deathculture.net/lucene/solr/1.4.1/apache-solr-1.4.1.tgz'
   homepage 'http://lucene.apache.org/solr/'
   md5 '258a020ed8c3f44e13b09e8ae46a1c84'
 
+  def script; <<-EOS.undent
+    #!/bin/sh
+    if [ -z "$1" ]; then
+      echo "Usage: $ solr path/to/config/dir"
+    else
+      cd #{prefix}/example && java -Dsolr.solr.home=$1 -jar start.jar
+    fi
+    EOS
+  end
+
   def install
-    prefix.mkpath
     prefix.install Dir['*']
-    (bin+'solr').write(SOLR_START_SCRIPT % prefix)
+    (bin+'solr').write script
   end
 
-  def caveats
-    <<-END_CAVEATS
-To start solr: 
-    $ solr path/to/solr/config/dir
-
-See the solr homepage for more setup information:
-    $ brew home solr
+  def caveats; <<-EOS.undent
+    To start solr:
+      $ solr path/to/solr/config/dir
 
-    END_CAVEATS
+    See the solr homepage for more setup information:
+      $ brew home solr
+    EOS
   end
 end