debian.erb in knife-server-1.0.1

- old
+ new

@@ -1,6 +1,6 @@
-bash -c '
+bash <<'EOS'
 <%
   require 'erb'
 
   def render(partial)
     partial_path = Gem.find_files(File.join(
@@ -43,11 +43,11 @@
   # add the GPG Key and Update Index
   mkdir -p /etc/apt/trusted.gpg.d
   apt-get update
   # permanent upgradeable keyring
   apt-get install -y --force-yes opscode-keyring
-  apt-get upgrade -y
+  apt-get dist-upgrade -y
 }
 
 preseed_chef_pkg() {
   local preseed=/var/cache/local/preseeding/chef-server.seed
 
@@ -62,11 +62,12 @@
 }
 
 install_chef_server() {
   preseed_chef_pkg
 
-  apt-get install -y --force-yes chef chef-server libshadow-ruby1.8
+  apt-get update
+  apt-get install -y chef chef-server libshadow-ruby1.8
 }
 
 config_chef_solo() {
   ## Configure Apache2 to proxy SSL traffic, using chef-solo
   local tmp_solo="$1"
@@ -103,7 +104,7 @@
 set_hostname_for_${platform}
 add_opscode_apt_repo
 install_chef_server
 enable_ssl_proxy
 
-banner "Bootstraping Chef Server on ${hostname} is complete."
-'
+banner "Bootstrapping Chef Server on ${hostname} is complete."
+EOS