From d83bada9beb19012d27689c2aa58687a3fe98f7b Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 14 Sep 2014 13:39:24 -0500 Subject: mariadb: remove dead code The "client-only" option was removed on account of it not working. --- Library/Formula/mariadb.rb | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/mariadb.rb b/Library/Formula/mariadb.rb index bfd4c5f17..2920a387b 100644 --- a/Library/Formula/mariadb.rb +++ b/Library/Formula/mariadb.rb @@ -104,26 +104,24 @@ class Mariadb < Formula s.gsub!("!includedir /etc/my.cnf.d", "!includedir #{etc}/my.cnf.d") end - unless build.include? 'client-only' - # Don't create databases inside of the prefix! - # See: https://github.com/Homebrew/homebrew/issues/4975 - rm_rf prefix+'data' + # Don't create databases inside of the prefix! + # See: https://github.com/Homebrew/homebrew/issues/4975 + rm_rf prefix+'data' - (prefix+'mysql-test').rmtree if build.without? 'tests' # save 121MB! - (prefix+'sql-bench').rmtree if build.without? 'bench' + (prefix+'mysql-test').rmtree if build.without? 'tests' # save 121MB! + (prefix+'sql-bench').rmtree if build.without? 'bench' - # Link the setup script into bin - bin.install_symlink prefix/"scripts/mysql_install_db" + # Link the setup script into bin + bin.install_symlink prefix/"scripts/mysql_install_db" - # Fix up the control script and link into bin - inreplace "#{prefix}/support-files/mysql.server" do |s| - s.gsub!(/^(PATH=".*)(")/, "\\1:#{HOMEBREW_PREFIX}/bin\\2") - # pidof can be replaced with pgrep from proctools on Mountain Lion - s.gsub!(/pidof/, 'pgrep') if MacOS.version >= :mountain_lion - end - - bin.install_symlink prefix/"support-files/mysql.server" + # Fix up the control script and link into bin + inreplace "#{prefix}/support-files/mysql.server" do |s| + s.gsub!(/^(PATH=".*)(")/, "\\1:#{HOMEBREW_PREFIX}/bin\\2") + # pidof can be replaced with pgrep from proctools on Mountain Lion + s.gsub!(/pidof/, 'pgrep') if MacOS.version >= :mountain_lion end + + bin.install_symlink prefix/"support-files/mysql.server" end def post_install -- cgit v1.2.3