replace s6 with svtree bundle

Signed-off-by: Robert Günzler <r@gnzler.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/items/svc_s6rc.py b/items/svc_s6rc.py
index 429c04a..c827f05 100644
--- a/items/svc_s6rc.py
+++ b/items/svc_s6rc.py
@@ -8,8 +8,8 @@ S6RC_ROOT = "/etc/s6-rc"
 def generate_request_path(template, service) -> str:
     return Path(S6RC_ROOT, "generate", f"{template}.{service}").as_posix()
 
-def service_dependency_path(bundle, service) -> str:
-    return Path(S6RC_ROOT, "services", bundle, "contents.d", service).as_posix()
+def bundle_dependency_path(bundle, service) -> str:
+    return Path(S6RC_ROOT, "src", bundle, "contents.d", service).as_posix()
 
 def have_generate_template(node, template) -> bool:
     template_path = Path(S6RC_ROOT, "templates", template)
@@ -43,7 +43,7 @@ def generate_service(node, template, service) -> bool:
 def is_service_registered(node, bundle, service) -> bool:
     try:
         result = node.run(
-            f"test -f {quote(service_dependency_path(bundle, service))}",
+            f"test -f {quote(bundle_dependency_path(bundle, service))}",
         )
         return result.return_code == 0
     except:
@@ -51,7 +51,7 @@ def is_service_registered(node, bundle, service) -> bool:
 
 def register_service(node, bundle, service) -> bool:
     result = node.run(
-        f"touch {quote(service_dependency_path(bundle, service))}",
+        f"touch {quote(bundle_dependency_path(bundle, service))}",
     )
     return result.return_code == 0