From 2114683bb8116297fd8bdc9c5e31b2e5092d4fd8 Mon Sep 17 00:00:00 2001
From: Thomas Gubler <thomasgubler@gmail.com>
Date: Tue, 27 Jan 2015 09:57:07 +0100
Subject: [PATCH] rc.interface: expand mixer variables

---
 ROMFS/px4fmu_common/init.d/rc.interface | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface
index 7fde482df735..b5be9bb2116d 100644
--- a/ROMFS/px4fmu_common/init.d/rc.interface
+++ b/ROMFS/px4fmu_common/init.d/rc.interface
@@ -13,21 +13,21 @@ then
 
 	if [ $MIXER_AUX == none ]
 	then
-		set MIXER_AUX $MIXER.aux
+		set MIXER_AUX ${MIXER}.aux
 	fi
 
 	# Use the mixer file from the SD-card if it exists
-	if [ -f $SDCARD_MIXERS_PATH/$MIXER.main.mix ]
+	if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix ]
 	then
-		set MIXER_FILE $SDCARD_MIXERS_PATH/$MIXER.main.mix
+		set MIXER_FILE ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix
 	# Try out the old convention, for backward compatibility
 	else
 
-		if [ -f $SDCARD_MIXERS_PATH/$MIXER.mix ]
+		if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.mix ]
 		then
-			set MIXER_FILE $SDCARD_MIXERS_PATH/$MIXER.mix
+			set MIXER_FILE ${SDCARD_MIXERS_PATH}/${MIXER}.mix
 		else
-			set MIXER_FILE /etc/mixers/$MIXER.main.mix
+			set MIXER_FILE /etc/mixers/${MIXER}.main.mix
 		fi
 	fi
 
@@ -104,14 +104,14 @@ then
 
 	set MIXER_AUX_FILE none
 
-	if [ -f $SDCARD_MIXERS_PATH/$MIXER_AUX.mix ]
+	if [ -f ${SDCARD_MIXERS_PATH}/${MIXER_AUX}.mix ]
 	then
-		set MIXER_AUX_FILE $SDCARD_MIXERS_PATH/$MIXER_AUX.mix
+		set MIXER_AUX_FILE ${SDCARD_MIXERS_PATH}/${MIXER_AUX}.mix
 	else
 
-		if [ -f /etc/mixers/$MIXER_AUX.mix ]
+		if [ -f /etc/mixers/${MIXER_AUX}.mix ]
 		then
-			set MIXER_AUX_FILE /etc/mixers/$MIXER_AUX.mix
+			set MIXER_AUX_FILE /etc/mixers/${MIXER_AUX}.mix
 		fi
 	fi