Remove usage of bash subshell in MSM

Remove usage of bash subshell in MSM for invocation of the
mycroft.message.send module.  The virtualenv wouldn't be created in that
subshell, breaking Github-style installs of Mycroft.
pull/1219/head
penrods 2017-11-09 15:48:24 -06:00 committed by Arron Atchison
parent 38d7a99b93
commit 4c9bbee680
1 changed files with 9 additions and 9 deletions

18
msm/msm
View File

@ -132,41 +132,41 @@ function send_start_install () {
} }
function send_start_update () { function send_start_update () {
if [[ "${update_started}" == "false" ]] ; then if [[ "${update_started}" == "false" ]] ; then
res=$( python -m mycroft.messagebus.send msm.updating ) python -m mycroft.messagebus.send msm.updating
update_started="true" update_started="true"
fi fi
} }
function send_start_remove () { function send_start_remove () {
if [[ "${remove_started}" == "false" ]] ; then if [[ "${remove_started}" == "false" ]] ; then
res=$( python -m mycroft.messagebus.send msm.removing ) python -m mycroft.messagebus.send msm.removing
remove_started="true" remove_started="true"
fi fi
} }
function send_install_success () { function send_install_success () {
res=$( python -m mycroft.messagebus.send msm.install.succeeded '{"skill": "${1}" }' ) python -m mycroft.messagebus.send msm.install.succeeded '{"skill": "${1}" }'
} }
function send_install_fail () { function send_install_fail () {
res=$( python -m mycroft.messagebus.send msm.install.failed '{"skill": "${1}", "error" : ${2} }' ) python -m mycroft.messagebus.send msm.install.failed '{"skill": "${1}", "error" : ${2} }'
} }
function send_remove_success () { function send_remove_success () {
res=$( python -m mycroft.messagebus.send msm.remove.succeeded '{"skill": "${1}" }' ) python -m mycroft.messagebus.send msm.remove.succeeded '{"skill": "${1}" }'
} }
function send_remove_fail () { function send_remove_fail () {
res=$( python -m mycroft.messagebus.send msm.remove.failed '{"skill": "${1}", "error" : ${2} }' ) python -m mycroft.messagebus.send msm.remove.failed '{"skill": "${1}", "error" : ${2} }'
} }
function send_end_install () { function send_end_install () {
if [[ "${install_started}" == "true" ]] ; then if [[ "${install_started}" == "true" ]] ; then
res=$( python -m mycroft.messagebus.send msm.installed ) python -m mycroft.messagebus.send msm.installed
fi fi
} }
function send_end_update () { function send_end_update () {
if [[ "${update_started}" == "true" ]] ; then if [[ "${update_started}" == "true" ]] ; then
res=$( python -m mycroft.messagebus.send msm.updated ) python -m mycroft.messagebus.send msm.updated
fi fi
} }
function send_end_remove () { function send_end_remove () {
if [[ "${remove_started}" == "true" ]] ; then if [[ "${remove_started}" == "true" ]] ; then
res=$( python -m mycroft.messagebus.send msm.removed ) python -m mycroft.messagebus.send msm.removed
fi fi
} }