fixed #463 triggered phrase empty by default

alexylem · Mar 3, 2017 · 1375bee · 1375bee
1 parent 3282dcb
commit 1375bee
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/jarvis-config-default.sh b/jarvis-config-default.sh
@@ -5,7 +5,7 @@ dictionary="stt_engines/pocketsphinx/jarvis-dictionary.dic"
 gain="0"
 google_speech_api_key=""
 phrase_failed="This command has returned an error"
-phrase_triggered="Yes?"
+phrase_triggered=""
 phrase_welcome="Hello"
 phrase_misunderstood="I did not understand"
 language="en_GB"

diff --git a/jarvis.sh b/jarvis.sh
@@ -210,7 +210,7 @@ configure () {
             eval "$1=\"$(dialog_select "Select a voice for $language" voices[@] ${!1})\"";;
         phrase_failed)                  eval "$1=\"$(dialog_input 'What to say if user command failed' "${!1}")\"";;
         phrase_misunderstood)           eval "$1=\"$(dialog_input 'What to say if order not recognized' "${!1}")\"";;
-        phrase_triggered)               eval "$1=\"$(dialog_input 'What to say when magic word is heard' "${!1}")\"";;
+        phrase_triggered)               eval "$1=\"$(dialog_input 'What to say when magic word is heard\nEx: Yes?' "${!1}")\"";;
         phrase_welcome)                 eval "$1=\"$(dialog_input 'What to say at program startup' "${!1}")\"";;
         play_hw)
             while true; do
@@ -758,7 +758,7 @@ while true; do
                     echo $trigger # new line
                     bypass=true
                     jv_hook "entering_cmd"
-                    say "$phrase_triggered"
+                    [ -n "$phrase_triggered" ] && say "$phrase_triggered"
                     continue 2
                 fi
 

diff --git a/stt_engines/google/main.sh → stt_engines/google_old/main.sh b/stt_engines/google/main.sh → stt_engines/google_old/main.sh
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-17.03.02
+17.03.03