From ab66113f0bac341b161bdb28c80bb1575093e744 Mon Sep 17 00:00:00 2001
From: Max Howell <max@methylblue.com>
Date: Sat, 6 Aug 2011 11:28:07 +0100
Subject: [PATCH] Ensure that we undo the o+w chmod

---
 install_homebrew.rb | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/install_homebrew.rb b/install_homebrew.rb
index 08299f74b1..88312d7507 100644
--- a/install_homebrew.rb
+++ b/install_homebrew.rb
@@ -109,23 +109,24 @@ end
 
 sudo "/bin/mkdir /usr/local" unless File.directory? "/usr/local"
 sudo "/bin/chmod o+w /usr/local"
-sudo "/bin/chmod", "g+w", *chmods unless chmods.empty?
-sudo "/usr/bin/chgrp", "staff", *chgrps unless chgrps.empty?
-system "/bin/mkdir", *root_dirs unless root_dirs.empty?
+begin
+  sudo "/bin/chmod", "g+w", *chmods unless chmods.empty?
+  sudo "/usr/bin/chgrp", "staff", *chgrps unless chgrps.empty?
+  system "/bin/mkdir", *root_dirs unless root_dirs.empty?
 
-
-Dir.chdir "/usr/local" do
-  ohai "Downloading and Installing Homebrew..."
-  # -m to stop tar erroring out if it can't modify the mtime for root owned directories
-  # pipefail to cause the exit status from curl to propogate if it fails
-  system "/bin/bash -o pipefail -c '/usr/bin/curl -sSfL https://github.com/mxcl/homebrew/tarball/master | /usr/bin/tar xz -m --strip 1'"
+  Dir.chdir "/usr/local" do
+    ohai "Downloading and Installing Homebrew..."
+    # -m to stop tar erroring out if it can't modify the mtime for root owned directories
+    # pipefail to cause the exit status from curl to propogate if it fails
+    system "/bin/bash -o pipefail -c '/usr/bin/curl -sSfL https://github.com/mxcl/homebrew/tarball/master | /usr/bin/tar xz -m --strip 1'"
+  end
+ensure
+  # we reset the permissions of /usr/local because we want to minimise the
+  # amount of fiddling we do to the system. Some tools require /usr/local to
+  # be by non-writable for non-root users.
+  sudo "/bin/chmod o-w /usr/local"
 end
 
-# we reset the permissions of /usr/local because we want to minimise the
-# amount of fiddling we do to the system. Some tools require /usr/local to be
-# by non-writable for non-root users.
-sudo "/bin/chmod o-w /usr/local"
-
 warn "/usr/local/bin is not in your PATH." unless ENV['PATH'].split(':').include? '/usr/local/bin'
 warn "Now install Xcode: http://developer.apple.com/technologies/xcode.html" unless Kernel.system "/usr/bin/which -s gcc"