From a0cecbc773e94cf397bc5b21b2f5591f10edec67 Mon Sep 17 00:00:00 2001
From: lengschder97 <lengschder@googlemail.com>
Date: Tue, 13 Jan 2026 07:49:27 +0100
Subject: [PATCH] Fixed requested changes

---
 ct/forgejo-runner.sh              | 28 +++++++---------------------
 install/forgejo-runner-install.sh | 23 +++++------------------
 2 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/ct/forgejo-runner.sh b/ct/forgejo-runner.sh
index 6c63ee339..9b50ad51b 100644
--- a/ct/forgejo-runner.sh
+++ b/ct/forgejo-runner.sh
@@ -33,38 +33,24 @@ function update_script() {
     exit 1
   fi
 
-  msg_info "Stopping Forgejo Runner"
+  msg_info "Stopping Services"
   systemctl stop forgejo-runner
-  msg_ok "Stopped Forgejo Runner"
+  msg_ok "Stopped Services"
 
   msg_info "Fetching latest Forgejo Runner version"
   OS=$(uname -s | tr '[:upper:]' '[:lower:]')
   ARCH=$(uname -m)
 
-  case "$ARCH" in
-    x86_64) ARCH="amd64" ;;
-    aarch64|arm64) ARCH="arm64" ;;
-    armv7l) ARCH="armv7" ;;
-    *) echo "Unsupported architecture: $ARCH" >&2; exit 1 ;;
-  esac
-
-  RELEASE=$(curl -fsSL https://data.forgejo.org/api/v1/repos/forgejo/runner/releases/latest \
-    | grep -oP '"tag_name":\s*"\K[^"]+' | sed 's/^v//')
-
+  RELEASE=$(curl -fsSL https://data.forgejo.org/api/v1/repos/forgejo/runner/releases/latest | grep -oP '"tag_name":\s*"\K[^"]+' | sed 's/^v//')
   msg_info "Updating Forgejo Runner to v${RELEASE}"
-
-  curl -fsSL \
-    "https://data.forgejo.org/forgejo/runner/releases/download/v${RELEASE}/forgejo-runner-${OS}-${ARCH}" \
-    -o forgejo-runner
-
+  curl -fsSL "https://data.forgejo.org/forgejo/runner/releases/download/v${RELEASE}/forgejo-runner-${OS}-${ARCH}" -o forgejo-runner
 
   chmod +x /usr/local/bin/forgejo-runner
   msg_ok "Updated Forgejo Runner"
 
-  msg_info "Starting Forgejo Runner"
-  systemctl enable -q --now forgejo-runner
-  msg_ok "Started Forgejo Runner"
-
+  msg_info "Starting Services"
+  systemctl start forgejo-runner
+  msg_ok "Started Services"
   msg_ok "Update completed successfully!"
   exit
 }
diff --git a/install/forgejo-runner-install.sh b/install/forgejo-runner-install.sh
index 0f55d77f0..be021e489 100644
--- a/install/forgejo-runner-install.sh
+++ b/install/forgejo-runner-install.sh
@@ -31,17 +31,13 @@ export FORGEJO_RUNNER_TOKEN="$var_forgejo_runner_token"
 
 msg_info "Installing dependencies"
 $STD apt install -y \
-  jq git \
+  git \
   podman podman-docker
 msg_ok "Dependencies installed"
 
 msg_info "Enabling Podman socket"
 systemctl enable --now podman.socket
-msg_ok "Podman socket enabled"
-
-RAW_ARCH=$(uname -m)
-ARCH=$(echo "$RAW_ARCH" | sed 's/x86_64/amd64/;s/aarch64/arm64/')
-msg_info "Detected architecture: $ARCH"
+msg_ok "Enabled Podman socket"
 
 msg_info "Fetching latest Forgejo Runner release"
 RUNNER_VERSION=$(
@@ -49,22 +45,16 @@ RUNNER_VERSION=$(
   jq -r .name | sed 's/^v//'
 )
 
-[[ -z "$RUNNER_VERSION" ]] && {
-  msg_error "Unable to determine Forgejo Runner version"
-  exit 1
-}
-
 msg_ok "Forgejo Runner v${RUNNER_VERSION}"
 
 FORGEJO_URL="https://code.forgejo.org/forgejo/runner/releases/download/v${RUNNER_VERSION}/forgejo-runner-${RUNNER_VERSION}-linux-${ARCH}"
 
 msg_info "Downloading Forgejo Runner"
-wget -q -O /usr/local/bin/forgejo-runner "$FORGEJO_URL"
+curl -fsSL "$FORGEJO_URL" -o /usr/local/bin/forgejo-runner
 chmod +x /usr/local/bin/forgejo-runner
 msg_ok "Runner installed"
 
 msg_info "Registering Forgejo Runner"
-
 export DOCKER_HOST="unix:///run/podman/podman.sock"
 
 forgejo-runner register \
@@ -73,11 +63,9 @@ forgejo-runner register \
   --name "$HOSTNAME" \
   --labels "linux-${ARCH}:docker://node:20-bookworm" \
   --no-interactive
-
 msg_ok "Runner registered"
 
-msg_info "Creating systemd service"
-
+msg_info "Creating Services"
 cat <<EOF >/etc/systemd/system/forgejo-runner.service
 [Unit]
 Description=Forgejo Runner
@@ -97,9 +85,8 @@ TimeoutSec=0
 [Install]
 WantedBy=multi-user.target
 EOF
-
 systemctl enable -q --now forgejo-runner
-msg_ok "Forgejo Runner service enabled"
+msg_ok "Created Services"
 
 motd_ssh
 customize