From 10f235c66c367c097ffdcb6b12763b8a068e7ddd Mon Sep 17 00:00:00 2001
From: Steve Ellis <sellis6688@gmail.com>
Date: Wed, 9 Nov 2011 21:09:54 -0500
Subject: [PATCH 1/2] Install textmate's application support directory as
 WS_USER instead of as root so that PlugIns can install

---
 recipes/textmate_bundles.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes/textmate_bundles.rb b/recipes/textmate_bundles.rb
index 8ee5d4b9..0b4982db 100644
--- a/recipes/textmate_bundles.rb
+++ b/recipes/textmate_bundles.rb
@@ -2,10 +2,10 @@
 filename = "Pivotal.tmbundle"
 tarfile = "#{filename}.tar.gz"
 unless File.exists?("#{bundle_dir}/#{filename}")
-  directory bundle_dir do
-    action :create
-    recursive true
-    owner WS_USER
+  execute "make textmate bundles directory" do
+    command "mkdir -p '#{bundle_dir}'"
+    user WS_USER
+    not_if { File.exists?(bundle_dir) }
   end
 
   remote_file "#{bundle_dir}/#{tarfile}" do
@@ -15,4 +15,4 @@
   end
 
   execute "cd \"#{bundle_dir}\"; tar xzf #{tarfile}; rm #{tarfile}"
-end
\ No newline at end of file
+end

From 3209bef6db4f0fa6bd8946ffc9c8839d5505a8c4 Mon Sep 17 00:00:00 2001
From: Brian Cunnie <pair+cunnie@pivotallabs.com>
Date: Fri, 11 Nov 2011 12:00:27 -0800
Subject: [PATCH 2/2] Rather than just /saying/ we're passing the args, we need
 to pass the args

---
 libraries/brew.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/brew.rb b/libraries/brew.rb
index 15648d9e..7844649d 100644
--- a/libraries/brew.rb
+++ b/libraries/brew.rb
@@ -4,7 +4,7 @@ def brew_install(package, opts={})
 
     execute "brew install #{package} #{opts[:brew_args]}" do
       user WS_USER
-      command "brew install #{package}"
+      command "brew install #{package} #{opts[:brew_args]}"
       not_if "brew list | grep '^#{package}$'"
     end
   end