diff options
38 files changed, 55 insertions, 164 deletions
diff --git a/Library/Formula/aiccu.rb b/Library/Formula/aiccu.rb index 7eb10fed2..fcf3f7a31 100644 --- a/Library/Formula/aiccu.rb +++ b/Library/Formula/aiccu.rb @@ -14,9 +14,6 @@ class Aiccu < Formula system "make", "install", "prefix=#{prefix}" etc.install 'doc/aiccu.conf' unless (etc/'aiccu.conf').exist? - - plist_path.write startup_plist - plist_path.chmod 0644 end def startup_plist; <<-EOS.undent @@ -72,6 +69,7 @@ class Aiccu < Formula EOS end end + __END__ diff --git a/Makefile b/Makefile index 0e96136..78609bd 100644 diff --git a/Library/Formula/apollo.rb b/Library/Formula/apollo.rb index dc78605ed..2ea6fecd7 100644 --- a/Library/Formula/apollo.rb +++ b/Library/Formula/apollo.rb @@ -20,8 +20,8 @@ class Apollo < Formula version "1.4" sha1 '777b9de3209f05af30d013d52c12f68f8391ab54' - option "no-bdb", "Install without bdb store support." - option "no-mqtt", "Install without MQTT protocol support." + option "no-bdb", "Install without bdb store support" + option "no-mqtt", "Install without MQTT protocol support" def install prefix.install %w{ LICENSE NOTICE readme.html docs examples } @@ -43,9 +43,6 @@ class Apollo < Formula #!/bin/bash exec "#{libexec}/bin/#{name}" "$@" EOS - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent @@ -68,29 +65,28 @@ class Apollo < Formula EOS end - def startup_plist; <<-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>KeepAlive</key> - <true/> - <key>Label</key> - <string>#{plist_name}</string> - <key>ProgramArguments</key> - <array> - <string>#{var}/apollo/bin/apollo-broker</string> - <string>run</string> - </array> - <key>RunAtLoad</key> - <true/> - <key>UserName</key> - <string>#{`whoami`.chomp}</string> - <key>WorkingDirectory</key> - <string>#{var}/apollo</string> - </dict> -</plist> -EOS + def startup_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>KeepAlive</key> + <true/> + <key>Label</key> + <string>#{plist_name}</string> + <key>ProgramArguments</key> + <array> + <string>#{var}/apollo/bin/apollo-broker</string> + <string>run</string> + </array> + <key>RunAtLoad</key> + <true/> + <key>UserName</key> + <string>#{`whoami`.chomp}</string> + <key>WorkingDirectory</key> + <string>#{var}/apollo</string> + </dict> + </plist> + EOS end - end diff --git a/Library/Formula/arangodb.rb b/Library/Formula/arangodb.rb index f1cc254b6..24252f649 100644 --- a/Library/Formula/arangodb.rb +++ b/Library/Formula/arangodb.rb @@ -24,9 +24,6 @@ class Arangodb < Formula (var+'arangodb').mkpath (var+'log/arangodb').mkpath - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/beanstalk.rb b/Library/Formula/beanstalk.rb index d07e7db86..683861307 100644 --- a/Library/Formula/beanstalk.rb +++ b/Library/Formula/beanstalk.rb @@ -7,9 +7,6 @@ class Beanstalk < Formula def install system "make", "install", "PREFIX=#{prefix}" - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats diff --git a/Library/Formula/cassandra.rb b/Library/Formula/cassandra.rb index f41e6c5b0..0d76121f6 100644 --- a/Library/Formula/cassandra.rb +++ b/Library/Formula/cassandra.rb @@ -30,9 +30,6 @@ class Cassandra < Formula (etc+"cassandra").install Dir["conf/*"] prefix.install Dir["*.txt"] + Dir["{bin,interface,javadoc,pylib,lib/licenses}"] prefix.install Dir["lib/*.jar"] - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/couchdb-lucene.rb b/Library/Formula/couchdb-lucene.rb index 96f528084..9799c9a34 100644 --- a/Library/Formula/couchdb-lucene.rb +++ b/Library/Formula/couchdb-lucene.rb @@ -15,8 +15,6 @@ class CouchdbLucene < Formula prefix.install Dir["couchdb-lucene-#{version}/*"] (etc + "couchdb/local.d/couchdb-lucene.ini").write ini_file - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/ddclient.rb b/Library/Formula/ddclient.rb index 34bafca0a..2e72ce52d 100644 --- a/Library/Formula/ddclient.rb +++ b/Library/Formula/ddclient.rb @@ -33,10 +33,6 @@ class Ddclient < Formula # Create etc & var paths (etc+'ddclient').mkpath (var+'run/ddclient').mkpath - - # Write the launchd script - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS diff --git a/Library/Formula/denyhosts.rb b/Library/Formula/denyhosts.rb index d006c1c2b..6662744de 100644 --- a/Library/Formula/denyhosts.rb +++ b/Library/Formula/denyhosts.rb @@ -36,31 +36,27 @@ class Denyhosts < Formula sbin.install_symlink libexec+'daemon-control' sbin.install_symlink libexec+'denyhosts.py' => 'denyhosts' - - plist_path.write cron_plist - plist_path.chmod 0644 end - def cron_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>#{HOMEBREW_PREFIX}/sbin/denyhosts</string> - </array> - <key>RunAtLoad</key> - <true/> - <key>KeepAlive</key> - <false/> - <key>StartInterval</key> - <integer>600</integer> - </dict> - </plist> + def startup_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>#{HOMEBREW_PREFIX}/sbin/denyhosts</string> + </array> + <key>RunAtLoad</key> + <true/> + <key>KeepAlive</key> + <false/> + <key>StartInterval</key> + <integer>600</integer> + </dict> + </plist> EOS end diff --git a/Library/Formula/dnsmasq.rb b/Library/Formula/dnsmasq.rb index 4ae11c138..b22f1e553 100644 --- a/Library/Formula/dnsmasq.rb +++ b/Library/Formula/dnsmasq.rb @@ -29,8 +29,6 @@ class Dnsmasq < Formula system "make", "install", "PREFIX=#{prefix}" prefix.install "dnsmasq.conf.example" - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/elasticsearch.rb b/Library/Formula/elasticsearch.rb index 14d023a91..be5548733 100644 --- a/Library/Formula/elasticsearch.rb +++ b/Library/Formula/elasticsearch.rb @@ -49,10 +49,6 @@ class Elasticsearch < Formula # Replace CLASSPATH paths to use libexec instead of lib s.gsub! /-cp \".*\"/, '-cp "$ES_HOME/libexec/*"' end - - # Write .plist file for `launchd` - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats diff --git a/Library/Formula/freeswitch.rb b/Library/Formula/freeswitch.rb index b4d81154c..98dc66599 100644 --- a/Library/Formula/freeswitch.rb +++ b/Library/Formula/freeswitch.rb @@ -25,9 +25,6 @@ class Freeswitch < Formula system "make" system "make install" system "make all cd-sounds-install cd-moh-install" - - plist_path.write startup_plist - plist_path.chmod 0644 end def startup_plist; <<-EOS.undent diff --git a/Library/Formula/gearman.rb b/Library/Formula/gearman.rb index 422a4d8c8..9ac10face 100644 --- a/Library/Formula/gearman.rb +++ b/Library/Formula/gearman.rb @@ -13,9 +13,6 @@ class Gearman < Formula def install system "./configure", "--prefix=#{prefix}", "--without-mysql" system "make install" - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/graylog2-server.rb b/Library/Formula/graylog2-server.rb index 2606fd6f6..0b26f8f84 100644 --- a/Library/Formula/graylog2-server.rb +++ b/Library/Formula/graylog2-server.rb @@ -26,9 +26,6 @@ class Graylog2Server < Formula etc.install "graylog2.conf" prefix.install Dir['*'] - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats diff --git a/Library/Formula/jenkins.rb b/Library/Formula/jenkins.rb index f8a4df46f..4576ae166 100644 --- a/Library/Formula/jenkins.rb +++ b/Library/Formula/jenkins.rb @@ -11,12 +11,10 @@ class Jenkins < Formula def install if build.head? system "mvn clean install -pl war -am -DskipTests" - mv 'war/target/jenkins.war', '.' + libexec.install 'war/target/jenkins.war', '.' + else + libexec.install "jenkins.war" end - - libexec.install "jenkins.war" - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/mariadb.rb b/Library/Formula/mariadb.rb index 19b98da0a..fe46dcd11 100644 --- a/Library/Formula/mariadb.rb +++ b/Library/Formula/mariadb.rb @@ -63,9 +63,6 @@ class Mariadb < Formula (prefix+'mysql-test').rmtree unless build.include? 'with-tests' # save 121MB! (prefix+'sql-bench').rmtree unless build.include? 'with-bench' - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/memcached.rb b/Library/Formula/memcached.rb index 1ab2efc2f..10062b7f5 100644 --- a/Library/Formula/memcached.rb +++ b/Library/Formula/memcached.rb @@ -17,9 +17,6 @@ class Memcached < Formula system "./configure", *args system "make install" - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/mongodb.rb b/Library/Formula/mongodb.rb index 58ccfa4a4..58c3a1096 100644 --- a/Library/Formula/mongodb.rb +++ b/Library/Formula/mongodb.rb @@ -25,10 +25,8 @@ class Mongodb < Formula (var+'mongodb').mkpath (var+'log/mongodb').mkpath - # Write the configuration files and launchd script + # Write the configuration files (prefix+'mongod.conf').write mongodb_conf - plist_path.write startup_plist - plist_path.chmod 0644 # copy the config file to etc if this is the first install. etc.install prefix+'mongod.conf' unless File.exists? etc+"mongod.conf" diff --git a/Library/Formula/mosquitto.rb b/Library/Formula/mosquitto.rb index c36775266..8b7ff9874 100644 --- a/Library/Formula/mosquitto.rb +++ b/Library/Formula/mosquitto.rb @@ -21,9 +21,6 @@ class Mosquitto < Formula # Create the working directory under var (var+'mosquitto').mkpath - - plist_path.write startup_plist - plist_path.chmod 0644 end def test diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb index 0e6b48f13..1788d2a44 100644 --- a/Library/Formula/mysql.rb +++ b/Library/Formula/mysql.rb @@ -89,9 +89,6 @@ class Mysql < Formula system "make" system "make install" - plist_path.write startup_plist - plist_path.chmod 0644 - # Don't create databases inside of the prefix! # See: https://github.com/mxcl/homebrew/issues/4975 rm_rf prefix+'data' diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb index db79360b6..0f8d588c9 100644 --- a/Library/Formula/nginx.rb +++ b/Library/Formula/nginx.rb @@ -53,9 +53,6 @@ class Nginx < Formula system "make" system "make install" man8.install "objs/nginx.8" - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/offline-imap.rb b/Library/Formula/offline-imap.rb index e05e79910..cc40b5cfe 100644 --- a/Library/Formula/offline-imap.rb +++ b/Library/Formula/offline-imap.rb @@ -12,9 +12,6 @@ class OfflineImap < Formula libexec.install 'bin/offlineimap' => 'offlineimap.py' libexec.install 'offlineimap' bin.install_symlink libexec+'offlineimap.py' => 'offlineimap' - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/openvpn.rb b/Library/Formula/openvpn.rb index e276ffe4c..b04633d27 100644 --- a/Library/Formula/openvpn.rb +++ b/Library/Formula/openvpn.rb @@ -34,10 +34,6 @@ class Openvpn < Formula # Create etc & var paths (etc + 'openvpn').mkpath (var + 'run/openvpn').mkpath - - # Write the launchd script - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS diff --git a/Library/Formula/percona-server.rb b/Library/Formula/percona-server.rb index 275bf025e..472f26804 100644 --- a/Library/Formula/percona-server.rb +++ b/Library/Formula/percona-server.rb @@ -78,8 +78,6 @@ class PerconaServer < Formula system "make" system "make install" - plist_path.write startup_plist - # Don't create databases inside of the prefix! # See: https://github.com/mxcl/homebrew/issues/4975 rm_rf prefix+'data' diff --git a/Library/Formula/perforce-proxy.rb b/Library/Formula/perforce-proxy.rb index 2e73ec2f8..72cecd93d 100644 --- a/Library/Formula/perforce-proxy.rb +++ b/Library/Formula/perforce-proxy.rb @@ -15,11 +15,7 @@ class PerforceProxy < Formula def install sbin.install 'p4p' - (var+"p4p").mkpath - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/pgbouncer.rb b/Library/Formula/pgbouncer.rb index e44374c55..9a557094f 100644 --- a/Library/Formula/pgbouncer.rb +++ b/Library/Formula/pgbouncer.rb @@ -19,9 +19,6 @@ class Pgbouncer < Formula system "make install" bin.install "etc/mkauth.py" etc.install %w(etc/pgbouncer.ini etc/userlist.txt) - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats diff --git a/Library/Formula/pincaster.rb b/Library/Formula/pincaster.rb index 2c6555992..c4dca6300 100644 --- a/Library/Formula/pincaster.rb +++ b/Library/Formula/pincaster.rb @@ -1,8 +1,8 @@ require 'formula' class Pincaster < Formula - url 'http://download.pureftpd.org/pincaster/releases/pincaster-0.5.tar.gz' homepage 'https://github.com/jedisct1/Pincaster' + url 'http://download.pureftpd.org/pincaster/releases/pincaster-0.5.tar.gz' sha1 '1982cf2fa98368b42f4bb947db5073e4f03ff6ad' def install @@ -16,8 +16,6 @@ class Pincaster < Formula etc.install "pincaster.conf" (var+"db/pincaster/").mkpath - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats diff --git a/Library/Formula/polipo.rb b/Library/Formula/polipo.rb index 38e2014f8..b93d95382 100644 --- a/Library/Formula/polipo.rb +++ b/Library/Formula/polipo.rb @@ -1,11 +1,12 @@ require 'formula' class Polipo < Formula - url 'http://freehaven.net/~chrisd/polipo/polipo-1.0.4.1.tar.gz' homepage 'http://www.pps.jussieu.fr/~jch/software/polipo/' - head 'git://git.wifi.pps.jussieu.fr/polipo' + url 'http://freehaven.net/~chrisd/polipo/polipo-1.0.4.1.tar.gz' sha1 'e755b585a9bba2b599a6bcc7c6f7035d3cb27bec' + head 'git://git.wifi.pps.jussieu.fr/polipo' + def install cache_root = (var + "cache/polipo") cache_root.mkpath @@ -18,9 +19,6 @@ class Polipo < Formula system "make", "all", *args system "make", "install", *args - - plist_path.write startup_plist - plist_path.chmod 0644 end def startup_plist diff --git a/Library/Formula/postgresql.rb b/Library/Formula/postgresql.rb index 91603b2d1..4c846a2bf 100644 --- a/Library/Formula/postgresql.rb +++ b/Library/Formula/postgresql.rb @@ -64,9 +64,6 @@ class Postgresql < Formula system "./configure", *args system "make install-world" - - plist_path.write startup_plist - plist_path.chmod 0644 end def check_python_arch diff --git a/Library/Formula/pure-ftpd.rb b/Library/Formula/pure-ftpd.rb index 9b8966a1b..d39abbe47 100644 --- a/Library/Formula/pure-ftpd.rb +++ b/Library/Formula/pure-ftpd.rb @@ -1,8 +1,8 @@ require 'formula' class PureFtpd < Formula - url 'http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.35.tar.gz' homepage 'http://www.pureftpd.org/' + url 'http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.35.tar.gz' sha1 'fed26bb1f36d71819a08873d94bbda52522ff96a' def install @@ -29,8 +29,6 @@ class PureFtpd < Formula system "./configure", *args system "make install" - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/rabbitmq.rb b/Library/Formula/rabbitmq.rb index 592245d6d..54c34a6f8 100644 --- a/Library/Formula/rabbitmq.rb +++ b/Library/Formula/rabbitmq.rb @@ -29,10 +29,6 @@ class Rabbitmq < Formula # Enable the management web UI enabled_plugins_path = etc+'rabbitmq/enabled_plugins' enabled_plugins_path.write enabled_plugins unless enabled_plugins_path.exist? - - # Create the plist file - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats diff --git a/Library/Formula/redis.rb b/Library/Formula/redis.rb index ec3630300..097aff979 100644 --- a/Library/Formula/redis.rb +++ b/Library/Formula/redis.rb @@ -36,8 +36,6 @@ class Redis < Formula end etc.install 'redis.conf' unless (etc/'redis.conf').exist? - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats diff --git a/Library/Formula/scm-manager.rb b/Library/Formula/scm-manager.rb index 61b41a6b5..c36c42029 100644 --- a/Library/Formula/scm-manager.rb +++ b/Library/Formula/scm-manager.rb @@ -37,9 +37,6 @@ class ScmManager < Formula java -jar "#{tools}/scm-cli-client-#{version}-jar-with-dependencies.jar" "$@" EOS chmod 0755, scmCliClient - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/selenium-server-standalone.rb b/Library/Formula/selenium-server-standalone.rb index d6376bceb..e0c6476eb 100644 --- a/Library/Formula/selenium-server-standalone.rb +++ b/Library/Formula/selenium-server-standalone.rb @@ -7,8 +7,6 @@ class SeleniumServerStandalone < Formula def install prefix.install "selenium-server-standalone-#{version}.jar" - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS diff --git a/Library/Formula/ser2net.rb b/Library/Formula/ser2net.rb index 95c8c2bf8..8c98439da 100644 --- a/Library/Formula/ser2net.rb +++ b/Library/Formula/ser2net.rb @@ -16,9 +16,6 @@ class Ser2net < Formula "--mandir=#{man}" system "make install" etc.install 'ser2net.conf' - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS.undent diff --git a/Library/Formula/sickbeard.rb b/Library/Formula/sickbeard.rb index 9c33a8cc8..a27cb696c 100644 --- a/Library/Formula/sickbeard.rb +++ b/Library/Formula/sickbeard.rb @@ -12,8 +12,6 @@ class Sickbeard < Formula def install prefix.install Dir['*'] (bin+"sickbeard").write(startup_script) - plist_path.write(startup_plist) - plist_path.chmod 0644 end def startup_plist; <<-EOS.undent diff --git a/Library/Formula/sonar.rb b/Library/Formula/sonar.rb index d8b6d2a1a..696b5e2ee 100644 --- a/Library/Formula/sonar.rb +++ b/Library/Formula/sonar.rb @@ -24,9 +24,6 @@ class Sonar < Formula else bin.install_symlink "#{libexec}/bin/macosx-universal-32/sonar.sh" => "sonar" end - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS diff --git a/Library/Formula/sshguard.rb b/Library/Formula/sshguard.rb index 4e2f3d8e3..9c22848bc 100644 --- a/Library/Formula/sshguard.rb +++ b/Library/Formula/sshguard.rb @@ -1,8 +1,8 @@ require 'formula' class Sshguard < Formula - url 'http://downloads.sourceforge.net/project/sshguard/sshguard/sshguard-1.5/sshguard-1.5.tar.bz2' homepage 'http://www.sshguard.net/' + url 'http://downloads.sourceforge.net/project/sshguard/sshguard/sshguard-1.5/sshguard-1.5.tar.bz2' sha1 'f8f713bfb3f5c9877b34f6821426a22a7eec8df3' def patches @@ -17,9 +17,6 @@ class Sshguard < Formula "--prefix=#{prefix}", "--with-firewall=ipfw" system "make install" - - plist_path.write startup_plist - plist_path.chmod 0644 end def caveats; <<-EOS diff --git a/Library/Formula/tor.rb b/Library/Formula/tor.rb index 6c9e6f100..c1d05478a 100644 --- a/Library/Formula/tor.rb +++ b/Library/Formula/tor.rb @@ -10,9 +10,6 @@ class Tor < Formula def install system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" system "make install" - - plist_path.write startup_plist - plist_path.chmod 0644 end def startup_plist |