Merge branch 'master' of github.com:pivotal/pivotal_workstation

lightyrs · Nov 16, 2011 · 4b13f98 · 4b13f98
2 parents cbd8f46 + 756f92f
commit 4b13f98
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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

diff --git 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
+end