From 0f3427dd1efa8c8cdf8505ce2254abeb3d71a264 Mon Sep 17 00:00:00 2001
From: ai-dev <ai-dev@fgitlab.my.to>
Date: Fri, 1 Nov 2024 23:07:32 +0100
Subject: [PATCH] update

---
 .../etc/s6-overlay/s6-rc.d/actrunner/run      | 54 -------------------
 .../etc/s6-overlay/s6-rc.d/actrunner/up       |  1 +
 .../etc/s6-overlay/s6-rc.d/init-actrunner/run | 46 +++++++++++++++-
 3 files changed, 46 insertions(+), 55 deletions(-)
 delete mode 100644 gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/run
 create mode 100644 gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/up

diff --git a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/run b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/run
deleted file mode 100644
index a17754f..0000000
--- a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/run
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-# ==============================================================================
-# Home Assistant Community Add-on: actrunner
-# Runs actrunner script
-# ==============================================================================
-
-declare log_level
-
-bashio::log.info 'Starting actrunner...'
-
-journal_path='/var/log/journal'
-if ! bashio::fs.directory_exists "${journal_path}" || [ -z "$(ls -A ${journal_path})" ]; then
-    bashio::log.info "No journal at ${journal_path}, looking for journal in /run/log/journal instead"
-    journal_path='/run/log/journal'
-fi
-
-case "$(bashio::config 'log_level')" in \
-    trace)      ;& \
-    debug)      log_level='debug' ;; \
-    notice)     ;& \
-    warning)    log_level='warn' ;; \
-    error)      ;& \
-    fatal)      log_level='error' ;; \
-    *)          log_level='info' ;; \
-esac;
-bashio::log.info "act_runner log level set to ${log_level}"
-
-export "JOURNAL_PATH=${journal_path}"
-export "LOG_LEVEL=${log_level}"
-
-# Activate the Ansible virtual environment
-source /opt/ansible-venv/bin/activate
-
-bashio::log.info "register act_runner !"
-
-# Load configuration from Home Assistant
-GITEA_URL=$(bashio::config 'gitea_url')
-GITEA_TOKEN=$(bashio::config 'gitea_token')
-RUNNER_NAME=$(bashio::config 'runner_name')
-RUNNER_LABEL=$(bashio::config 'runner_label')
-
-# Register the runner
-/usr/local/bin/act_runner register --no-interactive --instance "${GITEA_URL}" --token "${GITEA_TOKEN}" --name "${RUNNER_NAME}" --labels "${RUNNER_LABEL}"
-
-# Check if registration was successful
-if [ $? -ne 0 ]; then
-    bashio::log.error "Failed to register act_runner."
-    exit 1
-fi
-
-bashio::log.info "Registration complete. Starting act_runner in daemon mode..."
-
-exec exec /usr/local/bin/act_runner daemon
\ No newline at end of file
diff --git a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/up b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/up
new file mode 100644
index 0000000..a142d8d
--- /dev/null
+++ b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/up
@@ -0,0 +1 @@
+exec /usr/local/bin/act_runner daemon
\ No newline at end of file
diff --git a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/run b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/run
index 3fab621..ae1e829 100644
--- a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/run
+++ b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/run
@@ -5,4 +5,48 @@
 # Example init script, runs before any other service
 # ==============================================================================
 
-bashio::log.info "Oh, hi! I'm the init script!"
+declare log_level
+
+bashio::log.info 'Starting actrunner...'
+
+journal_path='/var/log/journal'
+if ! bashio::fs.directory_exists "${journal_path}" || [ -z "$(ls -A ${journal_path})" ]; then
+    bashio::log.info "No journal at ${journal_path}, looking for journal in /run/log/journal instead"
+    journal_path='/run/log/journal'
+fi
+
+case "$(bashio::config 'log_level')" in \
+    trace)      ;& \
+    debug)      log_level='debug' ;; \
+    notice)     ;& \
+    warning)    log_level='warn' ;; \
+    error)      ;& \
+    fatal)      log_level='error' ;; \
+    *)          log_level='info' ;; \
+esac;
+bashio::log.info "act_runner log level set to ${log_level}"
+
+export "JOURNAL_PATH=${journal_path}"
+export "LOG_LEVEL=${log_level}"
+
+# Activate the Ansible virtual environment
+source /opt/ansible-venv/bin/activate
+
+bashio::log.info "register act_runner !"
+
+# Load configuration from Home Assistant
+GITEA_URL=$(bashio::config 'gitea_url')
+GITEA_TOKEN=$(bashio::config 'gitea_token')
+RUNNER_NAME=$(bashio::config 'runner_name')
+RUNNER_LABEL=$(bashio::config 'runner_label')
+
+# Register the runner
+/usr/local/bin/act_runner register --no-interactive --instance "${GITEA_URL}" --token "${GITEA_TOKEN}" --name "${RUNNER_NAME}" --labels "${RUNNER_LABEL}"
+
+# Check if registration was successful
+if [ $? -ne 0 ]; then
+    bashio::log.error "Failed to register act_runner."
+    exit 1
+fi
+
+bashio::log.info "Registration complete. Starting act_runner in daemon mode..."