[dev_setup] Add key from keyserver

This removes the dependency of wget on adding Opscode packaging PGP
key.
  This also fixes a bug in previous commit of omitting a space before
the closing bracket.

  Test plan: manually remove the key and apt source and run dev_setup.

Change-Id: I445c62b718373f6da61ca9270b9ee1a04544a53f
This commit is contained in:
Jesse Zhang 2012-04-09 18:17:42 -07:00
Родитель c7682028a6
Коммит c5119dc6df
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -86,7 +86,7 @@ function run_cmd () {
# Check if we have access to the web
run_cmd apt-get $APT_CONFIG install -qym wget
if [ $? -ne 0]; then
if [ $? -ne 0 ]; then
echo "Can't install prerequisite: wget"
exit 1
fi
@ -104,7 +104,7 @@ 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 -
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 83EF826A
echo chef chef/chef_server_url select none | sudo /usr/bin/debconf-set-selections
fi
run_cmd apt-get $APT_CONFIG update -qq