From 644fe0ac24a5ee3f7f4dde29fe45369ef24247c8 Mon Sep 17 00:00:00 2001
From: MichaelOultram <MichaelOultram@users.noreply.github.com>
Date: Sat, 15 Aug 2015 15:43:56 +0100
Subject: [PATCH] Cleaned up circleci files

---
 .travis.yml             | 26 --------------------------
 circle.yml              |  5 -----
 install-dependencies.sh |  9 +++++++++
 3 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index defd123..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-language: go
-
-cache:
-  directories:
-  - $HOME/opus
-  - $HOME/bin
-  - $HOME/gopath/bin
-  - $HOME/gopath/pkg
-  - $HOME/gopath/src/github.com/nitrous-io
-  - $HOME/gopath/src/github.com/MichaelOultram/mumbledj/.vendor
-
-before_script:
-    - export PATH=$PATH:$HOME/bin/
-    - export LD_RUN_PATH=$LD_RUN_PATH:$HOME/opus/lib
-    - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/opus/lib
-    - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$HOME/opus/lib/pkgconfig
-    - bash install-dependencies.sh
-
-script:
-    - make
-    - make install
-
-after_success:
-    - ffmpeg -version
-    - youtube-dl --output ~/.mumbledj/songs/QcIy9NiNbmo.m4a --format m4a --prefer-ffmpeg -4 --verbose http://www.youtube.com/watch?v=QcIy9NiNbmo
-    - mumbledj -server=$MUMBLE_IP -port=$MUMBLE_PORT -username=travis -password=$MUMBLE_PASSWORD -verbose=true -test=true
\ No newline at end of file
diff --git a/circle.yml b/circle.yml
index 65be379..aeeb361 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,11 +7,7 @@ machine:
 
 dependencies:
     pre:
-        - sudo apt-get remove -y ffmpeg ffprobe
-        - sudo whereis ffmpeg
         - bash install-dependencies.sh
-        - sudo pip install youtube-dl
-        - ffmpeg -version
         
     override:
         - make
@@ -27,6 +23,5 @@ dependencies:
         
 test:
     override:
-        - youtube-dl --output ~/.mumbledj/songs/QcIy9NiNbmo.m4a --format m4a --prefer-ffmpeg -v http://www.youtube.com/watch?v=QcIy9NiNbmo
         - mumbledj -server=$MUMBLE_IP -port=$MUMBLE_PORT -username=circleci -password=$MUMBLE_PASSWORD -verbose=true -test=true:
             timeout: 180
\ No newline at end of file
diff --git a/install-dependencies.sh b/install-dependencies.sh
index 074d819..cb03750 100644
--- a/install-dependencies.sh
+++ b/install-dependencies.sh
@@ -17,6 +17,15 @@ else
   echo 'Using cached version of ffmpeg.';
 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/latest/youtube-dl -o ~/bin/youtube-dl
+    chmod a+rx ~/bin/youtube-dl
+else
+  echo 'Using cached version of youtube-dl.';
+fi
+
 # check to see if opus is installed
 if [ ! -d "$HOME/opus/lib" ]; then
     echo 'Installing opus'