diff --git a/circle.yml b/circle.yml index 5c4c59d..468b65c 100644 --- a/circle.yml +++ b/circle.yml @@ -7,7 +7,8 @@ machine: dependencies: pre: - - sudo apt-get -qqy remove ffmpeg + - sudo apt-get -y remove ffmpeg + - sudo apt-get -y install libavconf - bash install-dependencies.sh override: diff --git a/install-dependencies.sh b/install-dependencies.sh index a03870b..a02e6a5 100644 --- a/install-dependencies.sh +++ b/install-dependencies.sh @@ -2,22 +2,22 @@ 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* $HOME/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 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 + cd opus-1.0.3 && ./configure --prefix=~/opus && make && make install else echo 'Using cached version of opus.'; fi