Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

updating homebrew all the time (this might not be a great idea), and …

…fixing the vim recipe because command-t is dead
  • Loading branch information...
commit ca5920d960ad601cd555b9bbf49773d268b918a4 1 parent 5349144
@mkocher mkocher authored
Showing with 13 additions and 21 deletions.
  1. +1 −1  attributes/versions.rb
  2. +11 −12 recipes/homebrew.rb
  3. +1 −8 recipes/vim.rb
View
2  attributes/versions.rb
@@ -1,5 +1,5 @@
node.default[:versions]= {
- "homebrew" => "6c7f2d822d4dff6aff57474cc816b91a7474b31b",
+ "homebrew" => "448fbc9afa407de85f14c71ea53ad8f6c66134ab",
"rvm" => "869e226a8739dbc31dd958ff331d8b0a6f11d759",
"Pivotal-Preferences-RubyMine" => "d0eb393ab3d4c92ac80ce3135aa9f71e59cccbd3",
"RubyMine-VersionString" => "32",
View
23 recipes/homebrew.rb
@@ -9,19 +9,18 @@
# at least a bin directory because the user_owns_usr_local
# recipe creates it, and that's a pre-req. Also, things like
# MacFuse, Audacity, and others tend to put things in /usr/local
-if (`which brew`.empty?)
- git "/tmp/homebrew" do
- repository "https://github.com/mxcl/homebrew.git"
- revision homebrew_git_revision_hash
- destination "/tmp/homebrew"
- action :sync
- user WS_USER
- end
- execute "Copying homebrew's .git to /usr/local" do
- command "rsync -axSH /tmp/homebrew/ /usr/local/"
- user WS_USER
- end
+git "/tmp/homebrew" do
+ repository "https://github.com/mxcl/homebrew.git"
+ revision homebrew_git_revision_hash
+ destination "/tmp/homebrew"
+ action :sync
+ user WS_USER
+end
+
+execute "Copying homebrew's .git to /usr/local" do
+ command "rsync -axSH /tmp/homebrew/ /usr/local/"
+ user WS_USER
end
ruby_block "Check that homebrew is running & working" do
View
9 recipes/vim.rb
@@ -5,7 +5,7 @@
execute "brew install macvim with system ruby" do
user WS_USER
- command "rvm use system; brew install macvim; rvm use default"
+ command "rvm use system && brew install macvim"
not_if "brew list | grep '^macvim$'"
end
@@ -37,13 +37,6 @@
brew_install "ctags"
-execute "compile command-t" do
- only_if "test ! -f #{node["vim_home"]}/bundle/command-t/ruby/command-t/compiled"
- cwd "#{node["vim_home"]}/bundle/command-t/ruby/command-t"
- command "rvm use system && ruby extconf.rb && make && touch compiled && rvm use default"
- user WS_USER
-end
-
ruby_block "test to see if MacVim link worked" do
block do
raise "/Applications/MacVim install failed" unless File.exists?("/Applications/MacVim.app")
Please sign in to comment.
Something went wrong with that request. Please try again.