From cbd2bf99d8387f3d342ea8f0ef1283b5aacf44d0 Mon Sep 17 00:00:00 2001 From: Augusto Monteiro 'Sparky Date: Thu, 27 Apr 2017 15:04:16 -0700 Subject: [PATCH] #706 - Using configuration to get msm bin --- mycroft/configuration/mycroft.conf | 3 +++ mycroft/skills/main.py | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mycroft/configuration/mycroft.conf b/mycroft/configuration/mycroft.conf index ea3ffad9fe..b54d6a9074 100644 --- a/mycroft/configuration/mycroft.conf +++ b/mycroft/configuration/mycroft.conf @@ -221,5 +221,8 @@ "notify_delay": 5, "rate": 16000, "channels": 1 + }, + "SkillInstallerSkill": { + } } diff --git a/mycroft/skills/main.py b/mycroft/skills/main.py index 3b616d3231..7456c78e59 100644 --- a/mycroft/skills/main.py +++ b/mycroft/skills/main.py @@ -18,6 +18,7 @@ import json import os +import signal import subprocess import sys import time @@ -35,9 +36,6 @@ from mycroft.skills.intent_service import IntentService from mycroft.util import connected from mycroft.util.log import getLogger -from mycroft.lock import Lock # Creates PID file for single instance -import signal - # ignore DIGCHLD to terminate subprocesses correctly signal.signal(signal.SIGCHLD, signal.SIG_IGN) @@ -52,7 +50,8 @@ skills_directories = [] skill_reload_thread = None skills_manager_timer = None -MSM_BIN = join(MYCROFT_ROOT_PATH, 'msm', 'msm') +installer_config = ConfigurationManager.instance().get("SkillInstallerSkill") +MSM_BIN = installer_config.get("path", join(MYCROFT_ROOT_PATH, 'msm', 'msm')) def connect():