From 7b2c7ee8aa06148ac75a2bef8b6b1373d7f46a46 Mon Sep 17 00:00:00 2001
From: Dan <danielf@xmos.com>
Date: Mon, 4 Feb 2019 16:32:55 +0000
Subject: [PATCH 1/4] Install audacity and overwrite alias

---
 setup.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 2b51628..775e833 100755
--- a/setup.sh
+++ b/setup.sh
@@ -10,7 +10,8 @@ sudo sed -i -e 's/dtparam=audio=on/#dtparam=audio=on/' /boot/config.txt
 sudo sed -i -e 's/#dtparam=i2s=on/dtparam=i2s=on/' /boot/config.txt
 
 echo "Installing Raspberry Pi kernel headers"
-sudo apt-get install raspberrypi-kernel-headers
+sudo apt-get install -y raspberrypi-kernel-headers
+
 
 
 # Build loader and insert it into the kernel
@@ -79,6 +80,17 @@ if [ $# -ge 1 ] && [ $1 = "xvf3510" ] ; then
     echo "python $RPI_SETUP_DIR/resources/clk_dac_setup/reset_xvf3510.py"   >> $i2s_clk_dac_script
 fi
 
+if [ $# -ge 1 ] && [ $1 = "xvf3510" ] ; then
+    sudo apt-get install -y audacity
+    audacity_script=$RPI_SETUP_DIR/resources/run_audacity.sh
+    rm -f $audacity_script
+    echo "#!/usr/bin/env bash" >> $audacity_script
+    echo "audacity &" >> $audacity_script
+    echo "sleep 5" >> $audacity_script
+    echo "sudo $RPI_SETUP_DIR/resources/clk_dac_setup/setup_bclk >> /dev/null" >> $audacity_script
+    echo "alias audacity='sh $audacity_script &'" >> ~/.bashrc
+fi
+
 # Configure the I2C - disable the default built-in driver
 sudo sed -i -e 's/#\?dtparam=i2c_arm=on/dtparam=i2c_arm=off/' /boot/config.txt
 if ! grep -q "i2c-bcm2708" /etc/modules-load.d/modules.conf; then

From dd35b2ae2910d7328eebc1d9f931ffdd16b27b68 Mon Sep 17 00:00:00 2001
From: Dan Follent <35460137+dfollent@users.noreply.github.com>
Date: Mon, 4 Feb 2019 16:41:44 +0000
Subject: [PATCH 2/4] v1.3.2 changelog update

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ab7f4d..676ac09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # VocalFusion Raspberry Pi Setup Change Log
 
+## 1.3.2
+
+  * Added audacity installation and setup for XVF3510
+
 ## 1.3.1
 
   * Added reset for XVF3510

From 333d9d6c8b4c3315e47da773f7ae89fba434893f Mon Sep 17 00:00:00 2001
From: Dan <danielf@xmos.com>
Date: Mon, 4 Feb 2019 17:10:44 +0000
Subject: [PATCH 3/4] Moved audacity script to /usr/local/bin

---
 setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 775e833..e6ffd15 100755
--- a/setup.sh
+++ b/setup.sh
@@ -88,7 +88,8 @@ if [ $# -ge 1 ] && [ $1 = "xvf3510" ] ; then
     echo "audacity &" >> $audacity_script
     echo "sleep 5" >> $audacity_script
     echo "sudo $RPI_SETUP_DIR/resources/clk_dac_setup/setup_bclk >> /dev/null" >> $audacity_script
-    echo "alias audacity='sh $audacity_script &'" >> ~/.bashrc
+    sudo chmod +x $audacity_script
+    sudo mv $audacity_script /usr/local/bin/audacity
 fi
 
 # Configure the I2C - disable the default built-in driver

From 9c12d418cf952d3fd85da931162399a6bfd96937 Mon Sep 17 00:00:00 2001
From: Dan <danielf@xmos.com>
Date: Mon, 4 Feb 2019 17:20:17 +0000
Subject: [PATCH 4/4] Corrected audacity call

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index e6ffd15..1ef2511 100755
--- a/setup.sh
+++ b/setup.sh
@@ -85,7 +85,7 @@ if [ $# -ge 1 ] && [ $1 = "xvf3510" ] ; then
     audacity_script=$RPI_SETUP_DIR/resources/run_audacity.sh
     rm -f $audacity_script
     echo "#!/usr/bin/env bash" >> $audacity_script
-    echo "audacity &" >> $audacity_script
+    echo "/usr/bin/audacity &" >> $audacity_script
     echo "sleep 5" >> $audacity_script
     echo "sudo $RPI_SETUP_DIR/resources/clk_dac_setup/setup_bclk >> /dev/null" >> $audacity_script
     sudo chmod +x $audacity_script