From e52ed9a2d168989504c08101831189471e61147c Mon Sep 17 00:00:00 2001
From: MichaelOultram <MichaelOultram@users.noreply.github.com>
Date: Mon, 10 Aug 2015 01:33:46 +0100
Subject: [PATCH] Moved opus into bin folder

---
 Makefile                |  2 +-
 install-dependencies.sh | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 23a95e1..8c48293 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ install:
 	mkdir -p ~/.mumbledj/config
 	mkdir -p ~/.mumbledj/songs
 	mkdir -p ~/.mumbledj/web
-	if [ -a ~/.mumbledj/config/mumbledj.gcfg ]; then mv ~/.mumbledj/config/mumbledj.gcfg ~/.mumbledj/config/mumbledj_backup.gcfg; fi;
+	if [ -f ~/.mumbledj/config/mumbledj.gcfg ]; then mv ~/.mumbledj/config/mumbledj.gcfg ~/.mumbledj/config/mumbledj_backup.gcfg; fi;
 	cp -u config.gcfg ~/.mumbledj/config/mumbledj.gcfg
 	cp -u index.html ~/.mumbledj/web/index.html
 	if [ -d ~/bin ]; then cp -f mumbledj* ~/bin/mumbledj; else sudo cp -f mumbledj* /usr/local/bin/mumbledj; fi;
diff --git a/install-dependencies.sh b/install-dependencies.sh
index 90d3db1..bdd8241 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/opus/lib" ]; then
+if [ ! -d "$HOME/bin/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/opus && make && make install
+    cd opus-1.0.3 && ./configure --prefix=$HOME/bin && make && make install
 else
   echo 'Using cached version of opus.';
 fi
@@ -26,4 +26,9 @@ if [ ! -f "$HOME/bin/youtube-dl" ]; then
     chmod a+rx ~/bin/youtube-dl
 else
   echo 'Using cached version of youtube-dl.';
-fi
\ No newline at end of file
+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