From d4d6c608bdeaead0c967bd834ad2e730389bd55d Mon Sep 17 00:00:00 2001
From: Alex <alex@loetzimmer.de>
Date: Mon, 23 Dec 2019 20:39:01 +0100
Subject: [PATCH] Routines can now be triggered by either name or utterance

---
 alexa_remote_control.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/alexa_remote_control.sh b/alexa_remote_control.sh
index 7604319..f5c9d04 100755
--- a/alexa_remote_control.sh
+++ b/alexa_remote_control.sh
@@ -45,6 +45,7 @@
 #               (thanks to rich-gepp https://github.com/rich-gepp)
 # 2019-08-05: v0.14 added Volume setting via routine, and $SPEAKVOL
 # 2019-11-18: v0.14a download 200 routines instead of only the first 20
+# 2019-12-23: v0.14b Trigger routines by either utterance or routine name
 #
 ###
 #
@@ -570,11 +571,14 @@ if [ -n "${SEQUENCECMD}" ] ; then
 
 		AUTOMATION=$(jq --arg utterance "${UTTERANCE}" -r '.[] | select( .triggers[].payload.utterance == $utterance) | .automationId' "${TMP}/.alexa.automation")
 		if [ -z "${AUTOMATION}" ] ; then
-			echo "ERROR: no such utterance '${UTTERANCE}' in Alexa routines"
-			rm -f "${TMP}/.alexa.automation"
-			exit 1
+			AUTOMATION=$(jq --arg utterance "${UTTERANCE}" -r '.[] | select( .name == $utterance) | .automationId' "${TMP}/.alexa.automation")
+			if [ -z "${AUTOMATION}" ] ; then
+				echo "ERROR: no such utterance '${UTTERANCE}' in Alexa routines"
+				rm -f "${TMP}/.alexa.automation"
+				exit 1
+			fi
 		fi
-		SEQUENCE=$(jq --arg utterance "${UTTERANCE}" -r -c '.[] | select( .triggers[].payload.utterance == $utterance) | .sequence' "${TMP}/.alexa.automation" | sed 's/"/\\"/g' | sed "s/ALEXA_CURRENT_DEVICE_TYPE/${DEVICETYPE}/g" | sed "s/ALEXA_CURRENT_DSN/${DEVICESERIALNUMBER}/g" | sed "s/ALEXA_CUSTOMER_ID/${MEDIAOWNERCUSTOMERID}/g")
+		SEQUENCE=$(jq --arg automation "${AUTOMATION}" -r -c '.[] | select( .automationId == $automation) | .sequence' "${TMP}/.alexa.automation" | sed 's/"/\\"/g' | sed "s/ALEXA_CURRENT_DEVICE_TYPE/${DEVICETYPE}/g" | sed "s/ALEXA_CURRENT_DSN/${DEVICESERIALNUMBER}/g" | sed "s/ALEXA_CUSTOMER_ID/${MEDIAOWNERCUSTOMERID}/g")
 		rm -f "${TMP}/.alexa.automation"
 
 		ALEXACMD='{"behaviorId":"'${AUTOMATION}'","sequenceJson":"'${SEQUENCE}'","status":"ENABLED"}'