From 16ae6685c188fe5b919b3014b409408ab6a56d72 Mon Sep 17 00:00:00 2001
From: MichaelOultram <MichaelOultram@users.noreply.github.com>
Date: Wed, 12 Aug 2015 21:34:03 +0100
Subject: [PATCH] Changed how things are cached on circleci

---
 circle.yml              |  3 +--
 install-dependencies.sh | 12 +++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 02c2058..203f232 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,9 +14,8 @@ dependencies:
     cache_directories:
         - "~/opus"
         - "~/bin"
-        - "$(GOPATH)/src/github.com/nitrous-io"
         - "~/.vendor"
-        - "$(GOPATH)/bin/goop"
+        - "$(GOPATH)/src/github.com/nitrous-io"
 test:
     override:
         - mumbledj -server=$MUMBLE_IP -port=$MUMBLE_PORT -username=circleci -password=$MUMBLE_PASSWORD -verbose=true -test=true:
diff --git a/install-dependencies.sh b/install-dependencies.sh
index 6bf067a..4c9c3a8 100644
--- a/install-dependencies.sh
+++ b/install-dependencies.sh
@@ -3,6 +3,7 @@ set -e
 
 # check to see if ffmpeg is installed
 if [ ! -f "$HOME/bin/ffmpeg" ]; then
+    echo 'Installing ffmpeg'
     wget http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz -O /tmp/ffmpeg.tar.xz
     tar -xvf /tmp/ffmpeg.tar.xz --strip 1 --no-anchored ffmpeg ffprobe
     chmod a+rx ffmpeg ffprobe
@@ -13,6 +14,7 @@ fi
 
 # check to see if opus is installed
 if [ ! -d "$HOME/opus/lib" ]; then
+    echo 'Installing opus'
     wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz
     tar xzvf opus-1.0.3.tar.gz
     cd opus-1.0.3 && ./configure --prefix=$HOME/opus && make && make install
@@ -22,10 +24,18 @@ fi
 
 # check to see if youtube-dl is installed
 if [ ! -f "$HOME/bin/youtube-dl" ]; then
+    echo 'Installing youtube-dl'
     curl https://yt-dl.org/downloads/2015.07.28/youtube-dl -o ~/bin/youtube-dl
     chmod a+rx ~/bin/youtube-dl
 else
   echo 'Using cached version of youtube-dl.';
 fi
 
-ls -lR $HOME/opus
\ No newline at end of file
+# check to see if goop is installed
+if [ ! -f "$HOME/bin/goop" ]; then
+    echo 'Installing goop'
+    go get github.com/nitrous-io/goop
+    mv $GOPATH/bin/goop ~/goop
+else
+  echo 'Using cached version of goop.';
+fi
\ No newline at end of file