Refactor web server. Move feedback sounds to dialogue system.

rhasspy · Mar 30, 2020 · 1047c57 · 1047c57
1 parent 059841b
commit 1047c57
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 20 deletions.
diff --git a/bin/rhasspy-voltron b/bin/rhasspy-voltron
@@ -46,6 +46,11 @@ fi
 
 profile_dir="${user_profiles}/${profile_name}"
 
+# Set environment variables
+export RHASSPY_BASE_DIR="${src_dir}"
+export RHASSPY_PROFILE="${profile_name}"
+export RHASSPY_PROFILE_DIR="${profile_dir}"
+
 # Extra arguments to pass to web server
 extra_web_args=("$@")
 

diff --git a/debian/bin/rhasspy b/debian/bin/rhasspy
@@ -55,6 +55,11 @@ fi
 
 profile_dir="${user_profiles}/${profile_name}"
 
+# Set environment variables
+export RHASSPY_BASE_DIR="${rhasspy_dir}"
+export RHASSPY_PROFILE="${profile_name}"
+export RHASSPY_PROFILE_DIR="${profile_dir}"
+
 # -----------------------------------------------------------------------------
 
 set -e

diff --git a/rhasspy-asr-kaldi-hermes b/rhasspy-asr-kaldi-hermes
diff --git a/rhasspy-asr-pocketsphinx-hermes b/rhasspy-asr-pocketsphinx-hermes
diff --git a/rhasspy-dialogue-hermes b/rhasspy-dialogue-hermes
diff --git a/rhasspy-fuzzywuzzy-hermes b/rhasspy-fuzzywuzzy-hermes
diff --git a/rhasspy-hermes b/rhasspy-hermes
diff --git a/rhasspy-homeassistant-hermes b/rhasspy-homeassistant-hermes
diff --git a/rhasspy-microphone-cli-hermes b/rhasspy-microphone-cli-hermes
diff --git a/rhasspy-microphone-pyaudio-hermes b/rhasspy-microphone-pyaudio-hermes
diff --git a/rhasspy-nlu-hermes b/rhasspy-nlu-hermes
diff --git a/rhasspy-rasa-nlu-hermes b/rhasspy-rasa-nlu-hermes
diff --git a/rhasspy-remote-http-hermes b/rhasspy-remote-http-hermes
diff --git a/rhasspy-server-hermes b/rhasspy-server-hermes
diff --git a/rhasspy-silence b/rhasspy-silence
diff --git a/rhasspy-speakers-cli-hermes b/rhasspy-speakers-cli-hermes
diff --git a/rhasspy-supervisor b/rhasspy-supervisor
diff --git a/rhasspy-tts-cli-hermes b/rhasspy-tts-cli-hermes
diff --git a/rhasspy-wake-pocketsphinx-hermes b/rhasspy-wake-pocketsphinx-hermes
diff --git a/rhasspy-wake-porcupine-hermes b/rhasspy-wake-porcupine-hermes
diff --git a/rhasspy-wake-precise-hermes b/rhasspy-wake-precise-hermes
diff --git a/rhasspy-wake-snowboy-hermes b/rhasspy-wake-snowboy-hermes