[scenario] Make sure extra_skills is supported

OpenVoiceOS · May 31, 2024 · d38781d · d38781d
1 parent 729a5ee
commit d38781d
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -55,6 +55,7 @@ channel: development
 profile: ovos
 features:
   skills: true
+  extra_skills: false
   gui: true
 rapsberry_pi_tuning: true
 share_telemetry: true

diff --git a/scenarios/scenario-ovos-skills-and-gui-rpi4b.yml b/scenarios/scenario-ovos-skills-and-gui-rpi4b.yml
@@ -5,6 +5,7 @@ channel: development
 profile: ovos
 features:
   skills: true
+  extra_skills: false
   gui: true
 rapsberry_pi_tuning: true
 share_telemetry: true
diff --git a/scenarios/scenario-ovos-skills-and-gui.yml b/scenarios/scenario-ovos-skills-and-gui.yml
@@ -5,6 +5,7 @@ channel: development
 profile: ovos
 features:
   skills: true
+  extra_skills: false
   gui: true
 rapsberry_pi_tuning: false
 share_telemetry: true
diff --git a/scenarios/scenario-ovos-skills.yml b/scenarios/scenario-ovos-skills.yml
@@ -5,6 +5,7 @@ channel: development
 profile: ovos
 features:
   skills: true
+  extra_skills: false
   gui: false
 rapsberry_pi_tuning: false
 share_telemetry: true
diff --git a/scenarios/scenario-satellite.yml b/scenarios/scenario-satellite.yml
@@ -10,6 +10,7 @@ hivemind:
   password: 255203b3c8a7e59de1d60441a55d4f48
 features:
   skills: false
+  extra_skills: false
   gui: false
 rapsberry_pi_tuning: false
 share_telemetry: true
diff --git a/scenarios/scenario-server.yml b/scenarios/scenario-server.yml
@@ -5,6 +5,7 @@ channel: development
 profile: server
 features:
   skills: true
+  extra_skills: true
   gui: false
 rapsberry_pi_tuning: false
 share_telemetry: true
diff --git a/scenarios/scenario-uninstall.yml b/scenarios/scenario-uninstall.yml
@@ -5,6 +5,7 @@ channel: development
 profile: satellite
 features:
   skills: false
+  extra_skills: false
   gui: false
 rapsberry_pi_tuning: false
 share_telemetry: true
diff --git a/utils/constants.sh b/utils/constants.sh
@@ -42,7 +42,7 @@ export PULSE_SOCKET_WSL2=/mnt/wslg/PulseServer
 export REBOOT_FILE_PATH=/tmp/ovos.reboot
 declare -ra SCENARIO_ALLOWED_OPTIONS=(features channel share_telemetry profile method uninstall rapsberry_pi_tuning hivemind)
 export SCENARIO_ALLOWED_OPTIONS
-declare -ra SCENARIO_ALLOWED_FEATURES=(skills extra-skills gui)
+declare -ra SCENARIO_ALLOWED_FEATURES=(skills extra_skills gui)
 export SCENARIO_ALLOWED_FEATURES
 declare -ra SCENARIO_ALLOWED_HIVEMIND_OPTIONS=(host port key password)
 export SCENARIO_ALLOWED_HIVEMIND_OPTIONS

diff --git a/utils/scenario.sh b/utils/scenario.sh
@@ -114,6 +114,17 @@ if [ -f "$SCENARIO_PATH" ]; then
                             fi
                             export FEATURE_SKILLS
                             ;;
+                        extra_skills)
+                            if [[ "${features[$feature]}" == "true" ]]; then
+                                FEATURE_EXTRA_SKILLS="true"
+                            elif [[ "${features[$feature]}" == "false" ]]; then
+                                FEATURE_EXTRA_SKILLS="false"
+                            else
+                                export SCENARIO_NOT_SUPPORTED="true"
+                                break
+                            fi
+                            export FEATURE_EXTRA_SKILLS
+                            ;;
                         gui)
                             if [[ "${features[$feature]}" == "true" ]]; then
                                 FEATURE_GUI="true"