Rename mycroft-roon-skill -> (ovos) skill-roon

Ramblurr · Aug 27, 2023 · 1247e9d · 1247e9d
1 parent ba6633b
commit 1247e9d
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/docker-dev/Dockerfile b/docker-dev/Dockerfile
@@ -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"]
diff --git a/docker-dev/docker-compose.yml b/docker-dev/docker-compose.yml
@@ -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
@@ -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

diff --git a/docker-dev/entrypoint.sh b/docker-dev/entrypoint.sh
@@ -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
diff --git a/docker-dev/run.sh b/docker-dev/run.sh
@@ -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 \

diff --git a/docker-dev/supervisord.conf b/docker-dev/supervisord.conf
@@ -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
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -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"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -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
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
@@ -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

diff --git a/pyproject.toml b/pyproject.toml
@@ -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]>"]
@@ -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"
 
 

diff --git a/skill.json b/skill.json
@@ -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",