From 889112ca848c597f84d4a9ef5116667f0b55dc31 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 11 Dec 2014 19:16:18 -0500
Subject: [PATCH] More work on base install script

---
 installer/install | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/installer/install b/installer/install
index 6078b867f..4255d91ca 100755
--- a/installer/install
+++ b/installer/install
@@ -313,10 +313,13 @@ RABBITMQ_USER=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^user/ ) print $2}' ${
 RABBITMQ_PASSWORD=$(awk -F ' = ' '{if (! ($0 ~ /^;/) && $0 ~ /^password/ ) print $2}' ${AIRTIMEROOT}/airtime_mvc/build/airtime.example.conf)
 EXCHANGES="airtime-pypo|pypo-fetch|airtime-media-monitor|media-monitor"
 
+# Ignore errors in this check to avoid dying when vhost isn't found
+set +e
 rabbitmqctl list_vhosts | grep -w ${RABBITMQ_VHOST}
 RESULT="$?"
+set -e
 
-# Only run these if the user doesn't exist
+# Only run these if the vhost doesn't exist
 if [ "${RESULT}" != "0" ]; then
     verbose "\n * Creating RabbitMQ user ${RABBITMQ_USER}..."
 
@@ -327,7 +330,7 @@ else
 fi
 
 verbose "\n * Setting RabbitMQ user permissions..."
-loudCmd 'rabbitmqctl set_permissions -p ${RABBITMQ_VHOST} ${RABBITMQ_USER} "$EXCHANGES" "$EXCHANGES" "$EXCHANGES"'
+loudCmd "rabbitmqctl set_permissions -p ${RABBITMQ_VHOST} ${RABBITMQ_USER} \"$EXCHANGES\" \"$EXCHANGES\" \"$EXCHANGES\""
 
 if [ ! -d "/etc/airtime" ]; then
     loud "\n-----------------------------------------------------"