1 files changed, 31 insertions, 58 deletions
diff --git a/Library/Formula/mongodb.rb b/Library/Formula/mongodb.rb
index 76cfe4d90..962d19237 100644
--- a/Library/Formula/mongodb.rb
+++ b/Library/Formula/mongodb.rb
@@ -55,34 +55,6 @@ class Mongodb < Formula
     etc.install prefix+'mongod.conf' unless File.exists? etc+"mongod.conf"
   end
 
-  def caveats
-    bn = plist_path.basename
-    la = Pathname.new("#{ENV['HOME']}/Library/LaunchAgents")
-    prettypath = "~/Library/LaunchAgents/#{bn}"
-    domain = plist_path.basename('.plist')
-    load = "launchctl load -w #{prettypath}"
-    s = []
-
-    # we readlink because this path probably doesn't exist since caveats
-    # occurs before the link step of installation
-    if not (la/bn).file?
-      s << "To have launchd start #{name} at login:"
-      s << "    mkdir -p ~/Library/LaunchAgents" unless la.directory?
-      s << "    ln -s #{HOMEBREW_PREFIX}/opt/#{name}/*.plist ~/Library/LaunchAgents/"
-      s << "Then to load #{name} now:"
-      s << "    #{load}"
-      s << "Or, if you don't want/need launchctl, you can just run:"
-      s << "    mongod"
-    elsif Kernel.system "/bin/launchctl list #{domain} &>/dev/null"
-      s << "You should reload #{name}:"
-      s << "    launchctl unload -w #{prettypath}"
-      s << "    #{load}"
-    else
-      s << "To load #{name}:"
-      s << "    #{load}"
-    end
-  end
-
   def mongodb_conf; <<-EOS.undent
     # Store data in #{var}/mongodb instead of the default /data/db
     dbpath = #{var}/mongodb
@@ -96,35 +68,36 @@ class Mongodb < Formula
     EOS
   end
 
-  def startup_plist
-    return <<-EOS
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>#{plist_name}</string>
-  <key>ProgramArguments</key>
-  <array>
-    <string>#{opt_prefix}/mongod</string>
-    <string>run</string>
-    <string>--config</string>
-    <string>#{etc}/mongod.conf</string>
-  </array>
-  <key>RunAtLoad</key>
-  <true/>
-  <key>KeepAlive</key>
-  <false/>
-  <key>UserName</key>
-  <string>#{`whoami`.chomp}</string>
-  <key>WorkingDirectory</key>
-  <string>#{HOMEBREW_PREFIX}</string>
-  <key>StandardErrorPath</key>
-  <string>#{var}/log/mongodb/output.log</string>
-  <key>StandardOutPath</key>
-  <string>#{var}/log/mongodb/output.log</string>
-</dict>
-</plist>
-EOS
+  plist_options :manual => "mongod"
+
+  def plist; <<-EOS.undent
+    <?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+    <plist version="1.0">
+    <dict>
+      <key>Label</key>
+      <string>#{plist_name}</string>
+      <key>ProgramArguments</key>
+      <array>
+        <string>#{opt_prefix}/mongod</string>
+        <string>run</string>
+        <string>--config</string>
+        <string>#{etc}/mongod.conf</string>
+      </array>
+      <key>RunAtLoad</key>
+      <true/>
+      <key>KeepAlive</key>
+      <false/>
+      <key>UserName</key>
+      <string>#{`whoami`.chomp}</string>
+      <key>WorkingDirectory</key>
+      <string>#{HOMEBREW_PREFIX}</string>
+      <key>StandardErrorPath</key>
+      <string>#{var}/log/mongodb/output.log</string>
+      <key>StandardOutPath</key>
+      <string>#{var}/log/mongodb/output.log</string>
+    </dict>
+    </plist>
+    EOS
   end
 end