Merge pull request #22 from dfollent/master

Restructured repo, move to SDK v1.4

README.md

@@ -21,7 +21,7 @@ You will need:
 - HDMI cable
 - Fast-Ethernet connection with internet connectivity
 
-You will also need an Amazon Developer account: https://developer.amazon.com 
+You will also need an Amazon Developer account: https://developer.amazon.com
 
 ## Hardware setup
 Setup your hardware by following the **Hardware Setup** at: https://xmos.com/vocalfusion-avs
@@ -36,14 +36,11 @@ Brief instructions and additional notes are below:
 2. Open a terminal on the Raspberry Pi and clone this respository:  
 `cd ~; git clone https://github.com/xmos/vocalfusion-avs-setup`
 
-3. Either:  
-create a new Alexa device by following: https://github.com/alexa/alexa-avs-sample-app/wiki/Create-Security-Profile  
+3. Create a new Alexa device by following: https://github.com/alexa/alexa-avs-sample-app/wiki/Create-Security-Profile  
 (Note: the *Allowed Origins* and *Allowed Return URLs* should use **http**, not https.)  
-Or:  
-use an existing Alexa device by placing your `AlexaClientSDKConfig.json` file (with a valid refresh token) in the `~/vocalfusion-avs-setup/scripts/` folder.
 
 4. Run the installation script: `source ~/vocalfusion-avs-setup/auto_install.sh`  
-If necessary, enter your Alexa device details (*ProductID*, *ClientID* and *ClientSecret*), a serial number and your location.  
+You will be prompted enter your Alexa device details (*ProductID*, *ClientID* and *ClientSecret*), a serial number and your location.  
 Wait for the sensory (keyword detection) repository to clone, then read and accept the license agreement.  
 Wait for the script to complete the installation. This can take a while, for example:  
    - audio-setup: 4m40s

auto_install.sh

@@ -1,4 +1,23 @@
-SCRIPTS_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/scripts
+#!/usr/bin/env bash
 
-# Execute (rather than source) the main
-$SCRIPTS_DIR/avs-main.sh
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+pushd . > /dev/null
+cd $SCRIPT_DIR
+
+git clone git://github.com/xmos/vocalfusion-rpi-setup.git
+git clone git://github.com/xmos/avs-sdk-setup.git
+
+RPI_SETUP_DIR=$SCRIPT_DIR/vocalfusion-rpi-setup
+AVS_SETUP_DIR=$SCRIPT_DIR/avs-sdk-setup
+
+# Execute (rather than source) the setup scripts
+$RPI_SETUP_DIR/setup.sh
+
+echo "Installing Amazon AVS SDK..."
+
+$AVS_SETUP_DIR/setup.sh
+
+echo "Type 'sudo reboot' below to reboot the Raspberry Pi and complete the audio setup."
+
+popd > /dev/null