install/upgrade patchperl/cpanm in default recipe

leto · Jan 6, 2012 · 2caabcb · 2caabcb
1 parent 8091528
commit 2caabcb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/cookbooks/perlbrew/README.md b/cookbooks/perlbrew/README.md
@@ -32,8 +32,9 @@ Recipes
 perlbrew
 ----------
 
-Installs/updates perlbrew.  This is required for use of the LWRP.  Optionally
-installs perls specified in the `node['perlbrew']['perls']` attribute list.
+Installs/updates perlbrew along with patchperl and cpanm.  This is required for
+use of the LWRP.  Optionally installs perls specified in the
+`node['perlbrew']['perls']` attribute list.
 
 Resources/Providers
 ===================

diff --git a/cookbooks/perlbrew/recipes/default.rb b/cookbooks/perlbrew/recipes/default.rb
@@ -30,9 +30,13 @@
 
 # if we have perlbrew, upgrade it
 # XXX is this really a good idea?
-execute "perlbrew self-upgrade" do
+bash "perlbrew self-upgrade" do
   environment ({'PERLBREW_ROOT' => perlbrew_root})
-  command "#{perlbrew_bin} self-upgrade"
+  code <<-EOC
+  #{perlbrew_bin} self-upgrade
+  #{perlbrew_bin} -f install-patchperl
+  #{perlbrew_bin} -f install-cpanm
+  EOC
   only_if {::File.exists?(perlbrew_bin)}
 end
 
@@ -43,6 +47,7 @@
   code <<-EOC
   curl -kL http://install.perlbrew.pl > perlbrew-install
   source perlbrew-install
+  #{perlbrew_root}/bin/perlbrew -f install-cpanm
   EOC
   not_if {::File.exists?(perlbrew_bin)}
 end