From 13c45454dd638b40e3baa4994003e5db6457a4d8 Mon Sep 17 00:00:00 2001
From: Adam Warner <me@adamwarner.co.uk>
Date: Tue, 12 Jul 2022 16:40:04 +0100
Subject: [PATCH] finish service script wrapper Build this branch on push?

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
---
 .github/workflows/test-and-build.yaml | 1 +
 s6/service                            | 9 ++-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml
index 9a6dc9a..380a95e 100644
--- a/.github/workflows/test-and-build.yaml
+++ b/.github/workflows/test-and-build.yaml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - dev
+      - massive-refactor
   pull_request:
   release:
     types: [published]
diff --git a/s6/service b/s6/service
index 3db7c74..83d42d5 100755
--- a/s6/service
+++ b/s6/service
@@ -7,9 +7,7 @@ start() {
 }
 
 stop() {
-  #s6-svc -wD -d -T2500 /var/run/s6/services/$service
-  # /command/s6-svc -wD -d -T2500 /run/service/$service
-  /command/s6-rc -d change $service
+  /command/s6-svc -wD -d -T2500 /run/service/$service
 }
 
 restart() {
@@ -35,16 +33,13 @@ restart() {
 
   # Only attempt to start the service if it is not already running
   if [ -z "$pid" ]; then
-    # s6-svc -wu -u -T2500 /var/run/s6/services/$service
-    # /command/s6-svc -wu -u -T2500 /run/service/$service
-    /command/s6-rc -u change $service
+    /command/s6-svc -wu -u -T2500 /run/service/$service
   fi
 
 }
 
 status() {
   /command/s6-svstat /run/service/$service
-  #/var/run/s6/services/$service
 }
 
 service="$1"