From 9ab3b8433a9f731fc89152ad5bb05cbe7b4d4ddc Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Sun, 1 Jun 2025 16:21:54 +1200
Subject: [PATCH] 'Generic Commit'

---
 gitea-runner/config/service.env |  4 ++++
 gitea-runner/destroy.sh         |  2 +-
 gitea-runner/start.sh           |  2 +-
 gitea-runner/stop.sh            | 15 +++++++--------
 gitea-runner/uninstall.sh       |  3 +--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gitea-runner/config/service.env b/gitea-runner/config/service.env
index a51ebf8..370fe20 100644
--- a/gitea-runner/config/service.env
+++ b/gitea-runner/config/service.env
@@ -8,3 +8,7 @@ GITEA_URL="https://gitea.jde.nz"
 GITEA_TOKEN="GITEA_TOKEN"
 GITEA_RUNNER_NAME="${SERVER}-${SERVICE}"
 GITEA_RUNNER_LABELS="ubuntu-latest:docker://node:16-bullseye,ubuntu-22.04:docker://node:16-bullseye,ubuntu-20.04:docker://node:16-bullseye,ubuntu-18.04:docker://node:16-buster"
+
+# Server Settings
+SSH_USER="dropshell"
+
diff --git a/gitea-runner/destroy.sh b/gitea-runner/destroy.sh
index 461c076..b528477 100755
--- a/gitea-runner/destroy.sh
+++ b/gitea-runner/destroy.sh
@@ -7,4 +7,4 @@ _check_required_env_vars "SERVER" "SERVICE" "GITEA_RUNNER_DIRECTORY"
 # Call uninstall script first
 ./uninstall.sh
 
-echo "Destroyed ${CONTAINER_NAME}."
+echo "Destroyed ${SERVICE}"
diff --git a/gitea-runner/start.sh b/gitea-runner/start.sh
index 5eda7b8..372efa1 100755
--- a/gitea-runner/start.sh
+++ b/gitea-runner/start.sh
@@ -13,6 +13,6 @@ CONFIG_FILE="${GITEA_RUNNER_DIRECTORY}/config.yaml"
 
 "${GITEA_RUNNER_DIRECTORY}/act_runner" daemon --config "${CONFIG_FILE}" || _die "Failed to start act_runner"
 
-echo "act_runner started"
+echo "Started $SERVICE"
 
 
diff --git a/gitea-runner/stop.sh b/gitea-runner/stop.sh
index 6f23737..260eae5 100755
--- a/gitea-runner/stop.sh
+++ b/gitea-runner/stop.sh
@@ -5,12 +5,11 @@ source "${AGENT_PATH}/common.sh"
 _check_required_env_vars "SERVER" "SERVICE" "GITEA_RUNNER_DIRECTORY"
 
 # kill the act_runner process
-pkill -f "${GITEA_RUNNER_DIRECTORY}/act_runner"
-
-echo "act_runner stopped"
-
-
-
-
-
+if pgrep -f "${GITEA_RUNNER_DIRECTORY}/act_runner" > /dev/null; then
+    pkill -f "${GITEA_RUNNER_DIRECTORY}/act_runner"
+    echo "act_runner stopped"
+else
+    echo "act_runner is not running"
+fi
 
+echo "Stopped $SERVICE"
diff --git a/gitea-runner/uninstall.sh b/gitea-runner/uninstall.sh
index c9ea511..d210c2d 100755
--- a/gitea-runner/uninstall.sh
+++ b/gitea-runner/uninstall.sh
@@ -11,5 +11,4 @@ echo "Uninstalling service ${SERVICE}..."
 rm -rf "${GITEA_RUNNER_DIRECTORY}"
 
 
-echo "Service ${SERVICE} uninstalled."
-echo "Note: This does NOT remove the local data folder. Use destroy for that."
+echo "Uninstalled ${SERVICE}"