diff --git a/.travis.yml b/.travis.yml index 2ae6095..2cff0da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,10 @@ cache: - $HOME/gopath/src/github.com/MichaelOultram/mumbledj/.vendor before_install: - - export PATH=$PATH:~/bin/ - - export PATH=$PATH:$GOPATH/bin/ - - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$HOME/opus/lib/pkgconfig + - 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 - bash install-dependencies.sh install: diff --git a/install-dependencies.sh b/install-dependencies.sh index bdd8241..90d3db1 100644 --- a/install-dependencies.sh +++ b/install-dependencies.sh @@ -12,10 +12,10 @@ else fi # check to see if opus is installed -if [ ! -d "$HOME/bin/lib" ]; then +if [ ! -d "$HOME/opus/lib" ]; then 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/bin && make && make install + cd opus-1.0.3 && ./configure --prefix=$HOME/opus && make && make install else echo 'Using cached version of opus.'; fi @@ -26,9 +26,4 @@ if [ ! -f "$HOME/bin/youtube-dl" ]; then chmod a+rx ~/bin/youtube-dl else echo 'Using cached version of youtube-dl.'; -fi - -ls -l $HOME/bin -ls -l $HOME/bin/lib -ls -l $HOME/opus -ls -l $HOME/opus/lib \ No newline at end of file +fi \ No newline at end of file