ubuntu10.04-gems.erb in chef-0.10.0.beta.0

- old
+ new

@@ -6,14 +6,12 @@
   wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
   tar zxf rubygems-1.3.7.tgz
   cd rubygems-1.3.7
   ruby setup.rb --no-format-executable
 fi
+gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
 
-gem install ohai --no-rdoc --no-ri --verbose
-gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string(:gems) %>
-
 mkdir -p /etc/chef
 
 (
 cat <<'EOP'
 <%= IO.read(Chef::Config[:validation_key]) %>
@@ -27,13 +25,16 @@
 log_level        :info
 log_location     STDOUT
 chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
 validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 <% if @config[:chef_node_name] == nil %>
-# Using default node name (fqdn)
+# Using default node name"
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
-<% end %> 
+<% end %>
+<% if Chef::Config[:environment] != nil %>
+environment "<%= Chef::Config[:environment]%>"
+<% end %>
 EOP
 ) > /etc/chef/client.rb
 
 (
 cat <<'EOP'