mariadb: style nits

Formula/mariadb.rb

@@ -10,10 +10,6 @@ class Mariadb < Formula
     sha256 "09ecb41f988d051bd3eb4f0ddb6823a60c37e33eaaf4a5830a0b7e658aac8993" => :mavericks
   end
 
-  # upstream fix for compilation error, marked fixed for 10.1.16
-  # https://jira.mariadb.org/browse/MDEV-10322
-  patch :DATA
-
   option :universal
   option "with-test", "Keep test when installing"
   option "with-bench", "Keep benchmark app when installing"
@@ -38,6 +34,10 @@ class Mariadb < Formula
   conflicts_with "mariadb-connector-c",
     :because => "both install plugins"
 
+  # upstream fix for compilation error, marked fixed for 10.1.16
+  # https://jira.mariadb.org/browse/MDEV-10322
+  patch :DATA
+
   def install
     # Don't hard-code the libtool path. See:
     # https://github.com/Homebrew/homebrew/issues/20185
@@ -107,7 +107,7 @@ class Mariadb < Formula
     system "make", "install"
 
     # Fix my.cnf to point to #{etc} instead of /etc
-    (etc+"my.cnf.d").mkpath
+    (etc/"my.cnf.d").mkpath
     inreplace "#{etc}/my.cnf" do |s|
       s.gsub!("!includedir /etc/my.cnf.d", "!includedir #{etc}/my.cnf.d")
     end
@@ -115,10 +115,10 @@ class Mariadb < Formula
 
     # Don't create databases inside of the prefix!
     # See: https://github.com/Homebrew/homebrew/issues/4975
-    rm_rf prefix+"data"
+    rm_rf prefix/"data"
 
-    (prefix+"mysql-test").rmtree if build.without? "test" # save 121MB!
-    (prefix+"sql-bench").rmtree if build.without? "bench"
+    (prefix/"mysql-test").rmtree if build.without? "test" # save 121MB!
+    (prefix/"sql-bench").rmtree if build.without? "bench"
 
     # Link the setup script into bin
     bin.install_symlink prefix/"scripts/mysql_install_db"
@@ -150,7 +150,7 @@ class Mariadb < Formula
 
   def post_install
     # Make sure the var/mysql directory exists
-    (var+"mysql").mkpath
+    (var/"mysql").mkpath
     unless File.exist? "#{var}/mysql/mysql/user.frm"
       ENV["TMPDIR"] = nil
       system "#{bin}/mysql_install_db", "--verbose", "--user=#{ENV["USER"]}",
@@ -195,7 +195,7 @@ class Mariadb < Formula
 
   test do
     if build.with? "test"
-      (prefix+"mysql-test").cd do
+      (prefix/"mysql-test").cd do
         system "./mysql-test-run.pl", "status"
       end
     else