From 73ff3ea15e3ad046283e818e1f3afc6d102c0aaf Mon Sep 17 00:00:00 2001
From: Damien Deville <damien@ddeville.me>
Date: Sun, 2 Nov 2025 15:47:10 -0800
Subject: [PATCH] Fix typo in ephemeral env variable

The start script was checking for `EMPHEMERAL` rather than `EPHEMERAL`
and thus always setting the default value of `--ephemeral`.

I've also changed it to default to non ephemeral unless the caller
specifically sets the `EPHEMERAL` environment variable which sounds
clearer (so that if one doesn't want the runner to be ephemeral they
just don't set the environment variable rather than having to instead
set it to empty).

Note that this will change the behavior of the runner for existing
callers, not sure how you want to handle this.
---
 scripts/start | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/scripts/start b/scripts/start
index ea6f8d6..432f05e 100755
--- a/scripts/start
+++ b/scripts/start
@@ -8,40 +8,40 @@ echo "GH_APP_ID: ${GH_APP_ID}"
 echo "GH_APP_KEY_PATH: ${GH_APP_KEY_PATH}"
 echo "GH_APP_ID: ${GH_INSTALL_ID}"
 
-RUNNER_GROUP=${GROUP:-default}
-RUNNER_LABELS=${LABELS:-}
-EPHEMERAL=${EMPHEMERAL:-"--ephemeral"}
-
 fetch_token() {
   /opt/gha registration-token \
-  --app-id $GH_APP_ID \
-  --app-key-path $GH_APP_KEY_PATH \
-  --install-id $GH_INSTALL_ID \
-  --organization $GH_ORG
+    --app-id "$GH_APP_ID" \
+    --app-key-path "$GH_APP_KEY_PATH" \
+    --install-id "$GH_INSTALL_ID" \
+    --organization "$GH_ORG"
 }
 
 cleanup() {
   echo "Cleanup"
-  ./config.sh remove --token $(fetch_token)
+  ./config.sh remove --token "$(fetch_token)"
   exit
 }
 
-RUNNER_TOKEN=$(fetch_token)
+CONFIG_ARGS=(
+  --url "https://github.com/${GH_ORG}"
+  --token "$(fetch_token)"
+  --runnergroup "${GROUP:-default}"
+  --labels "${LABELS:-}"
+  --work /runner
+  --unattended
+  --replace
+  --disableupdate
+)
+
+case "${EPHEMERAL:-}" in
+true | TRUE | 1 | yes | on | --ephemeral) CONFIG_ARGS+=(--ephemeral) ;;
+esac
 
 if [ -f "/actions-runner/.runner" ]; then
   echo "Already configured"
 else
   echo "Configuring"
-  ./config.sh \
-    --url "https://github.com/${GH_ORG}" \
-    --token "${RUNNER_TOKEN}" \
-    --runnergroup "${RUNNER_GROUP}" \
-    --labels "${RUNNER_LABELS}" \
-    --work /runner \
-    --unattended \
-    --replace \
-    ${EPHEMERAL} \
-    --disableupdate
+  ./config.sh "${CONFIG_ARGS[@]}"
 fi
 
 # deregister runner on interrupt