get the right brew prefix

danishkhan · Aug 16, 2011 · 3ca969c · 3ca969c
1 parent f7843ba
commit 3ca969c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/cookbooks/homebrew/providers/homebrew.rb b/cookbooks/homebrew/providers/homebrew.rb
@@ -67,7 +67,7 @@ def install_package(name, version)
             end
           when "mysql"
             unless ::File.directory?("#{PREFIX}/var/mysql/mysql")
-              prefix = `brew --prefix mysql`.chomp
+              prefix = `#{PREFIX}/bin/brew --prefix mysql`.chomp
               system("unset TMPDIR; #{PREFIX}/bin/mysql_install_db --user=#{ENV['USER']} --basedir=#{prefix} --datadir=#{PREFIX}/var/mysql --tmpdir=/tmp > /dev/null")
             end
           else

diff --git a/cookbooks/ruby/recipes/rbenv.rb b/cookbooks/ruby/recipes/rbenv.rb
@@ -56,9 +56,8 @@
   interpreter "bash"
   code <<-EOS
     source ~/.cinderella.profile
-    gem install bundler
+    gem install bundler heroku cinderella
     gem install rake -v=0.8.7
-    gem install heroku
     rbenv rehash
   EOS
 end