Don't try and install sitepress-multilingual-cms in test environments

[chef.git] / cookbooks / civicrm / recipes / default.rb

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index cadc73212cff4aaeecff09f7a0cac7357f8c81cb..4486ea3520eb718c34c0aee434fc808182bcf32f 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -56,6 +56,7 @@ end
 wordpress_plugin "sitepress-multilingual-cms" do
   site "join.osmfoundation.org"
   repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
 wordpress_plugin "sitepress-multilingual-cms" do
   site "join.osmfoundation.org"
   repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"

+  not_if { ENV["TEST_KITCHEN"] }

 end
 
 wordpress_plugin "contact-form-7" do
 end
 
 wordpress_plugin "contact-form-7" do


@@ -91,7 +92,7 @@ end
 
 execute "#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" do
   action :nothing
 
 execute "#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" do
   action :nothing

-  command "unzip -qq #{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip"
+  command "unzip -o -qq #{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip"

   cwd "/opt/civicrm-#{civicrm_version}"
   user "wordpress"
   group "wordpress"
   cwd "/opt/civicrm-#{civicrm_version}"
   user "wordpress"
   group "wordpress"