Skip to content

Commit

Permalink
Rename mycroft-roon-skill -> (ovos) skill-roon
Browse files Browse the repository at this point in the history
  • Loading branch information
Ramblurr committed Aug 27, 2023
1 parent ba6633b commit 1247e9d
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions docker-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ VOLUME /roon-skill

COPY entrypoint.sh /entrypoint.sh

ENV ROON_PROXY_SOCK ipc:////mycroft_roon_skill/roon_proxy.sock
ENV ROON_PROXY_SOCK ipc:////skill_roon/roon_proxy.sock

#ENTRYPOINT ["ovos-skill-launcher", "mycroft-roon-skill.ramblurr"]
#ENTRYPOINT ["ovos-skill-launcher", "skill-roon.ramblurr"]
ENTRYPOINT ["/entrypoint.sh"]
4 changes: 2 additions & 2 deletions docker-dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
volumes:
- ${CONFIG_FOLDER}:/home/${OVOS_USER}/.config/mycroft
- ${TMP_FOLDER}:/tmp/mycroft
- ~/src/mycroft/roon-skill:/mycroft_roon_skill
- ~/src/mycroft/roon-skill:/skill_roon
logging: *default-logging
environment:
TZ: $TZ
Expand All @@ -50,7 +50,7 @@ services:
volumes:
- ${CONFIG_FOLDER}:/home/${OVOS_USER}/.config/mycroft
- ${TMP_FOLDER}:/tmp/mycroft
- ~/src/mycroft/roon-skill:/mycroft_roon_skill
- ~/src/mycroft/roon-skill:/skill_roon
logging: *default-logging
environment:
TZ: $TZ
Expand Down
4 changes: 2 additions & 2 deletions docker-dev/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env sh
set -ex

pip3 install -e /mycroft_roon_skill
pip3 install -e /skill_roon

COMMAND=${1:-"both"}

if [ "$COMMAND" = "server" ]; then
/home/ovos/.venv/bin/roon-proxy-server
elif [ "$COMMAND" = "skill" ]; then
/home/ovos/.venv/bin/ovos-skill-launcher mycroft-roon-skill.ramblurr /mycroft_roon_skill
/home/ovos/.venv/bin/ovos-skill-launcher skill-roon.ramblurr /skill_roon
else
/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
fi
2 changes: 1 addition & 1 deletion docker-dev/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SKILL_FOLDER=~/src/mycroft/roon-skill


podman run --userns=keep-id \
-v ${SKILL_FOLDER}:/mycroft_roon_skill:Z \
-v ${SKILL_FOLDER}:/skill_roon:Z \
-v ${CONFIG_FOLDER}:/home/${OVOS_USER}/.config/mycroft:Z \
-v ${TMP_FOLDER}:/tmp/mycroft:Z \
-it \
Expand Down
6 changes: 3 additions & 3 deletions docker-dev/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ file=/dev/shm/supervisor.sock


[program:skill]
command=/home/ovos/.venv/bin/ovos-skill-launcher mycroft-roon-skill.ramblurr /mycroft_roon_skill
command=/home/ovos/.venv/bin/ovos-skill-launcher skill-roon.ramblurr /skill_roon
#stdout_logfile=/dev/stdout
#stdout_logfile_maxbytes=0
stdout_logfile=/mycroft_roon_skill/skill.log
stdout_logfile=/skill_roon/skill.log
redirect_stderr=true

[program:roon_proxy]
command=/home/ovos/.venv/bin/roon-proxy-server
#stdout_logfile=/dev/stdout
#stdout_logfile_maxbytes=0
stdout_logfile=/mycroft_roon_skill/server.log
stdout_logfile=/skill_roon/server.log
redirect_stderr=true
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ RUN set -ex; \

COPY entrypoint.sh /entrypoint.sh

ENV ROON_PROXY_SOCK ipc:////mycroft_roon_skill/roon_proxy.sock
ENV ROON_PROXY_SOCK ipc:////skill_roon/roon_proxy.sock

ENTRYPOINT ["/entrypoint.sh"]
2 changes: 1 addition & 1 deletion docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COMMAND=${1:-"both"}
if [ "$COMMAND" = "server" ]; then
/home/ovos/.venv/bin/roon-proxy-server
elif [ "$COMMAND" = "skill" ]; then
/home/ovos/.venv/bin/ovos-skill-launcher mycroft-roon-skill.ramblurr
/home/ovos/.venv/bin/ovos-skill-launcher skill-roon.ramblurr
else
/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
fi
2 changes: 1 addition & 1 deletion docker/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ file=/dev/shm/supervisor.sock


[program:skill]
command=/home/ovos/.venv/bin/ovos-skill-launcher mycroft-roon-skill.ramblurr
command=/home/ovos/.venv/bin/ovos-skill-launcher skill-roon.ramblurr
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
redirect_stderr=true
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.poetry]
name = "mycroft-roon-skill"
name = "skill-roon"
version = "0.0.1"
description = "mycroft/ovos roon skill plugin"
authors = ["Ramblurr <[email protected]>"]
Expand Down Expand Up @@ -46,10 +46,10 @@ line-length = 88
profile = "black"

[tool.poetry.plugins."ovos.plugin.skill"]
"mycroft-roon-skill.ramblurr" = "mycroft-roon-skill:RoonSkill"
"skill-roon.ramblurr" = "skill-roon:RoonSkill"

[tool.poetry.scripts]
roon-skill = "mycroft_roon_skill:RoonSkill"
roon-skill = "skill_roon:RoonSkill"
roon-proxy-server = "roon_proxy.roon_proxy_server:main"


Expand Down
2 changes: 1 addition & 1 deletion skill.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Roon Skill",
"skillname": "mycroft-roon-skill.ramblurr",
"skillname": "skill-roon.ramblurr",
"authorname": "Casey Link",
"foldername": "",
"url": "https://github.com/ramblurr/ovos-skill-roon",
Expand Down

0 comments on commit 1247e9d

Please sign in to comment.