From 878f6b4319bb2c13a24788246492498e031e4a98 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Sun, 11 Aug 2024 16:00:51 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?=
 =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

rootfs/root/docker/setup/05-custom.sh
---
 rootfs/root/docker/setup/05-custom.sh | 30 +++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/rootfs/root/docker/setup/05-custom.sh b/rootfs/root/docker/setup/05-custom.sh
index ced3ad5..105d215 100755
--- a/rootfs/root/docker/setup/05-custom.sh
+++ b/rootfs/root/docker/setup/05-custom.sh
@@ -23,16 +23,12 @@ set -e -o pipefail
 [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
-GET_ARCH="$(uname -m | tr '[:upper]' '[:lower]')"
-case "$GET_ARCH" in
-x86_64) ARCH="amd64" && unset GET_ARCH ;;
-aarch64) ARCH="arm64" && unset GET_ARCH ;;
-*) echo "$GET_ARCH is not supported by this script" >&2 && exit 1 ;;
-esac
 exitCode=0
 GITEA_VERSION="${GITEA_VERSION:-latest}"
 GITEA_BIN_FILE="/usr/local/bin/gitea"
 ACT_BIN_FILE="/usr/local/bin/act_runner"
+ARCH="$(uname -m | tr '[:upper]' '[:lower]')"
+case "$ARCH" in x86_64) ARCH="amd64" ;; aarch64) ARCH="arm64" ;; *) echo "$ARCH is not supported by this script" >&2 && exit 1 ;; esac
 ACT_VERSIONS="$(curl -q -LSsf 'https://gitea.com/api/v1/repos/gitea/act_runner/releases' -H 'accept: application/json' | jq -r '.[].tag_name' | sort -Vr | head -n1)"
 ACT_URL="$(curl -q -LSsf "https://gitea.com/api/v1/repos/gitea/act_runner/releases/tags/$ACT_VERSIONS" -H 'accept: application/json' | jq -rc '.assets|.[]|.browser_download_url' | grep "linux.*$ARCH$")"
 if [ "$GITEA_VERSION" = "latest" ] || [ "$GITEA_VERSION" = "current" ]; then
@@ -43,20 +39,28 @@ fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
 echo "Dowloading gitea from $GITEA_URL"
-curl -q -LSsf "$GITEA_URL" -o "$GITEA_BIN_FILE" && GITEA=true || echo "Failed to download gitea" >&2
-echo "Downloading act_runner from $ACT_URL"
-curl -q -LSsf "$ACT_URL" -o "$ACT_BIN_FILE" && ACT=true || echo "Failed to download act_runner" >&2
-if [ "$GITEA" = true ] && [ "$ACT" = true ]; then
-  chmod +x "$GITEA_BIN_FILE" "$ACT_BIN_FILE"
+if curl -q -LSsf "$GITEA_URL" -o "$GITEA_BIN_FILE"; then
+  echo "gitea has been installed to: $GITEA_BIN_FILE"
+  chmod +x "$GITEA_BIN_FILE"
   if [ -d "/etc/sudoers.d" ]; then
     echo "gitea       ALL=(ALL)      NOPASSWD: ALL" >"/etc/sudoers.d/gitea"
     echo "docker      ALL=(ALL)      NOPASSWD: ALL" >"/etc/sudoers.d/docker"
   fi
 else
-  exitCode=5
+  echo "Failed to download gitea" >&2
+  exitCode=$((exitCode++))
 fi
+echo "Downloading act_runner from $ACT_URL"
+if curl -q -LSsf "$ACT_URL" -o "$ACT_BIN_FILE"; then
+  echo "act_runner has been installed to: $ACT_BIN_FILE"
+  chmod +x "$ACT_BIN_FILE"
+else
+  echo "Failed to download act_runner" >&2
+  exitCode=$((exitCode++))
+fi
+[ -x "$ACT_BIN_FILE" ] && [ -x "$GITEA_BIN_FILE" ] && exitCode=0
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
-[ $exitCode -eq 0 ] && [ -x "$ACT_BIN_FILE" ] && [ -x "$ACT_BIN_FILE" ] && echo "gitea has been installed to: $GITEA_BIN_FILE" || echo "Failed to install gitea or act_runner" >&2
+[ $exitCode -eq 0 ] || exitCode=1
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 exit $exitCode