Merge "[dev_setup] Chef Installation Clean Up"

dev_setup/bin/vcap_dev_setup

@@ -95,24 +95,14 @@ if [ $? == 0 ]; then
   fi
 fi
 
-# Install chef if required.
-which chef-solo
-if [ $? != 0 ]; then
-  if [[ $ALL != true ]]; then
-    read -p "chef-solo is required, should I install it? [Y/n]"
-    if [[ $REPLY =~ ^[nN]$ ]]; then
-      exit 0
-    fi
-  fi
-
+# Install chef
+if ! (apt-cache policy | grep opscode); then
   echo "deb http://apt.opscode.com/ `lsb_release -cs`-0.10 main" | sudo tee /etc/apt/sources.list.d/opscode.list
   wget -qO - http://apt.opscode.com/packages@opscode.com.gpg.key | sudo apt-key add -
   echo chef chef/chef_server_url select none | sudo /usr/bin/debconf-set-selections
-  run_cmd apt-get $APT_CONFIG update -qq
-  run_cmd apt-get $APT_CONFIG install -qym chef
-else
-  run_cmd apt-get $APT_CONFIG update -qq
 fi
+run_cmd apt-get $APT_CONFIG update -qq
+run_cmd apt-get $APT_CONFIG install -qym chef
 
 run_cmd apt-get $APT_CONFIG install -qym git-core
 [ -d $CLOUDFOUNDRY_HOME ] || mkdir $CLOUDFOUNDRY_HOME