Merge pull request #55 from chuckbutler/re-add-other-missing-tooling-…

…bumps Refactor installation dependency chain
juju-solutions · Sep 1, 2016 · 38f6700 · 38f6700
2 parents 760d6d4 + df6643f
commit 38f6700
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/install-review-tools.sh b/install-review-tools.sh
@@ -3,26 +3,29 @@ set -e
 HOME=/home/ubuntu
 
 # Add tims awesome PPA for the 2.0 bleeding edge tooling
-sudo add-apt-repository -y ppa:tvansteenburgh/ppa
+add-apt-repository -y ppa:tvansteenburgh/ppa
 
 apt-get update -qqy
-apt-get install -qy amulet \
-                         build-essential \
-                         cython \
-                         charm-tools \
-                         git \
-                         libssl-dev \
-                         make \
-                         python-dev \
-                         python3-dev \
-                         python-pip \
-                         python3-pip \
-                         python-virtualenv \
-                         rsync  \
-                         unzip
+apt-get install -qy  \
+                     build-essential \
+                     cython \
+                     git \
+                     juju-deployer \
+                     libssl-dev \
+                     make \
+                     python-dev \
+                     python-jujuclient \
+                     python3-dev \
+                     python-pip \
+                     python3-pip \
+                     python-virtualenv \
+                     rsync  \
+                     unzip
+
+apt install --no-install-recommends charm
 
 pip install --upgrade pip
-pip install amulet flake8 bundletester tox
+pip install amulet charm-tools flake8 bundletester tox
 
 # Fix for CI choking on duplicate hosts if the host key has changed
 # which is common.