From b02b77c4234485c70a71a69833d08ec0205ae5c4 Mon Sep 17 00:00:00 2001 From: David Calavera Date: Fri, 4 Jan 2013 23:59:49 -0800 Subject: [PATCH 1/3] Do not install brew --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 89fdb69e..c1d9d03a 100644 --- a/Rakefile +++ b/Rakefile @@ -8,7 +8,7 @@ task :install => [:submodule_init, :submodules] do puts "======================================================" puts - install_homebrew if RUBY_PLATFORM.downcase.include?("darwin") + #install_homebrew if RUBY_PLATFORM.downcase.include?("darwin") install_rvm_binstubs # this has all the runcoms from this directory. From 721836976c387cfff55436bd5b3734b1e06e7620 Mon Sep 17 00:00:00 2001 From: David Calavera Date: Sat, 26 Jan 2013 11:06:01 -0800 Subject: [PATCH 2/3] Install homebrew only if it's not in the path already. --- Rakefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Rakefile b/Rakefile index c1d9d03a..93c18ab7 100644 --- a/Rakefile +++ b/Rakefile @@ -8,7 +8,7 @@ task :install => [:submodule_init, :submodules] do puts "======================================================" puts - #install_homebrew if RUBY_PLATFORM.downcase.include?("darwin") + install_homebrew if RUBY_PLATFORM.downcase.include?("darwin") install_rvm_binstubs # this has all the runcoms from this directory. @@ -79,11 +79,15 @@ def install_rvm_binstubs end def install_homebrew - puts "======================================================" - puts "Installing Homebrew, the OSX package manager...If it's" - puts "already installed, this will do nothing." - puts "======================================================" - run %{ruby -e "$(curl -fsSkL raw.github.com/mxcl/homebrew/go)"} + brew_path = run("which brew") + unless $?.success? + puts "======================================================" + puts "Installing Homebrew, the OSX package manager...If it's" + puts "already installed, this will do nothing." + puts "======================================================" + run %{ruby -e "$(curl -fsSkL raw.github.com/mxcl/homebrew/go)"} + end + puts puts puts "======================================================" From 69b53d7d53036139f8eb11d4fb87e111269ac440 Mon Sep 17 00:00:00 2001 From: David Calavera Date: Sat, 26 Jan 2013 11:07:46 -0800 Subject: [PATCH 3/3] Follow code style. --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 93c18ab7..e6f583cc 100644 --- a/Rakefile +++ b/Rakefile @@ -79,7 +79,7 @@ def install_rvm_binstubs end def install_homebrew - brew_path = run("which brew") + run %{which brew} unless $?.success? puts "======================================================" puts "Installing Homebrew, the OSX package manager...If it's"