source altinstall

tjcravey · tjcravey · commit e767385f4a73 · 2013-07-26T11:59:19.000-05:00
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -29,6 +29,7 @@
   end
 else
   default['python']['prefix_dir']         = '/usr/local'
+  default['python']['install_type']       = 'install'
 end
 
 default['python']['binary'] = "#{python['prefix_dir']}/bin/python"
diff --git a/recipes/pip.rb b/recipes/pip.rb
@@ -25,6 +25,7 @@
 
 if node['python']['install_method'] == 'source'
   pip_binary = "#{node['python']['prefix_dir']}/bin/pip"
+  major_minor_version = node['python']['version'][/\d\.\d/]
 elsif platform_family?("rhel")
   pip_binary = "/usr/bin/pip"
 elsif platform_family?("smartos")
@@ -53,10 +54,28 @@
   not_if "#{node['python']['binary']} -c 'import setuptools'"
 end
 
+execute "altinstall-setuptools" do
+  cwd Chef::Config[:file_cache_path]
+  command <<-EOF
+  #{node['python']['binary']}#{major_minor_version} ez_setup.py
+  EOF
+  not_if "#{node['python']['binary']}-2.7 -c 'import setuptools'"
+  only_if {node['python']['install_type'] == "altinstall"}
+end
+
 execute "install-pip" do
   cwd Chef::Config[:file_cache_path]
   command <<-EOF
   #{node['python']['binary']} get-pip.py
   EOF
   not_if { ::File.exists?(pip_binary) }
 end
+
+execute "altinstall-pip" do
+  cwd Chef::Config[:file_cache_path]
+  command <<-EOF
+  #{node['python']['binary']}#{major_minor_version} get-pip.py
+  EOF
+  not_if { ::File.exists?(pip_binary) }
+  only_if {node['python']['install_type'] == "altinstall"}
+end
diff --git a/recipes/source.rb b/recipes/source.rb
@@ -33,6 +33,7 @@
 
 version = node['python']['version']
 install_path = "#{node['python']['prefix_dir']}/bin/python#{version.split(/(^\d+\.\d+)/)[1]}"
+install_type = node['python']['install_type']
 
 remote_file "#{Chef::Config[:file_cache_path]}/Python-#{version}.tar.bz2" do
   source "#{node['python']['url']}/#{version}/Python-#{version}.tar.bz2"
@@ -46,7 +47,7 @@
   code <<-EOF
   tar -jxvf Python-#{version}.tar.bz2
   (cd Python-#{version} && ./configure #{configure_options})
-  (cd Python-#{version} && make && make install)
+  (cd Python-#{version} && make && make #{install_type})
   EOF
   environment({
       "LDFLAGS" => "-L#{node['python']['prefix_dir']} -L/usr/lib",
