From 03dbb36361386b9c82dbf0a49a98cfc0b7408360 Mon Sep 17 00:00:00 2001
From: MichaelOultram <MichaelOultram@users.noreply.github.com>
Date: Wed, 12 Aug 2015 23:54:01 +0100
Subject: [PATCH] Fixing issue with youtube-dl and ffmpeg

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

diff --git a/circle.yml b/circle.yml
index 3dc319d..6630d03 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,14 +1,12 @@
 machine:
     environment:
-        PATH: $PATH:$HOME/bin/
+        PATH: $HOME/bin/:$PATH
         LD_RUN_PATH: $LD_RUN_PATH:$HOME/opus/lib
         LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$HOME/opus/lib
         PKG_CONFIG_PATH: $PKG_CONFIG_PATH:$HOME/opus/lib/pkgconfig
 
 dependencies:
     pre:
-        - sudo apt-get -qq update
-        - sudo apt-get -qqy install ffmpeg
         - bash install-dependencies.sh
         
     override:
diff --git a/install-dependencies.sh b/install-dependencies.sh
index d055fde..2331fb7 100644
--- a/install-dependencies.sh
+++ b/install-dependencies.sh
@@ -2,15 +2,15 @@
 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
-#    mv ff* ~/bin
-#else
-#  echo 'Using cached version of ffmpeg.';
-#fi
+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
+    mv ff* ~/bin
+else
+  echo 'Using cached version of ffmpeg.';
+fi
 
 # check to see if opus is installed
 if [ ! -d "$HOME/opus/lib" ]; then