postgresql: style cleanups

This brings the formula in line with the postgres formulae in
homebrew-versions.

1 files changed, 21 insertions, 23 deletions

diff --git a/Library/Formula/postgresql.rb b/Library/Formula/postgresql.rb
index c9ebb758c..d1a2e77b9 100644
--- a/Library/Formula/postgresql.rb
+++ b/Library/Formula/postgresql.rb
@@ -31,17 +31,19 @@ class Postgresql < Formula
   def install
     ENV.libxml2 if MacOS.version >= :snow_leopard
 
-    args = ["--disable-debug",
-            "--prefix=#{prefix}",
-            "--datadir=#{share}/#{name}",
-            "--docdir=#{doc}",
-            "--enable-thread-safety",
-            "--with-bonjour",
-            "--with-gssapi",
-            "--with-krb5",
-            "--with-openssl",
-            "--with-libxml",
-            "--with-libxslt"]
+    args = %W[
+      --disable-debug
+      --prefix=#{prefix}
+      --datadir=#{share}/#{name}
+      --docdir=#{doc}
+      --enable-thread-safety
+      --with-bonjour
+      --with-gssapi
+      --with-krb5
+      --with-openssl
+      --with-libxml
+      --with-libxslt
+    ]
 
     args << "--with-ossp-uuid" if build.with? 'ossp-uuid'
     args << "--with-python" unless build.include? 'no-python'
@@ -137,20 +139,16 @@ class Postgresql < Formula
       http://www.postgresql.org/docs/9.2/static/kernel-resources.html#SYSVIPC
     EOS
 
-    if MacOS.prefer_64_bit? then
-      s << <<-EOS.undent
-
-      To install postgresql (and ossp-uuid) in 32-bit mode:
-         brew install postgresql --32-bit
-
-      If you want to install the postgres gem, including ARCHFLAGS is recommended:
-          env ARCHFLAGS="-arch x86_64" gem install pg
+    s << gem_caveats if MacOS.prefer_64_bit?
+    return s
+  end
 
-      To install gems without sudo, see the Homebrew wiki.
-      EOS
-    end
+  def gem_caveats; <<-EOS.undent
+    When installing the postgres gem, including ARCHFLAGS is recommended:
+      ARCHFLAGS="-arch x86_64" gem install pg
 
-    return s
+    To install gems without sudo, see the Homebrew wiki.
+    EOS
   end
 
   plist_options :manual => "pg_ctl -D #{HOMEBREW_PREFIX}/var/postgres -l #{HOMEBREW_PREFIX}/var/postgres/server.log start"