entrypoint.sh

@@ -2,49 +2,63 @@
 
 set -eo pipefail
 
-if [[ -z "${OAUTH:-}" ]]; then
+die() {
-  echo "OAUTH is required: provide base64 encoded Codex auth.json." >&2
+  echo "$1" >&2
   exit 1
+}
+
+cleanup() {
+  rm -f "${auth_file:-}" "${auth_path:-}" "${codex_output:-}"
+}
+
+trap cleanup EXIT
+
+if [[ -z "${OAUTH:-}" ]]; then
+  die "OAUTH is required: provide base64 encoded Codex auth.json."
 fi
 
 if [[ -z "${MODEL:-}" ]]; then
-  echo "MODEL is required." >&2
+  die "MODEL is required."
-  exit 1
 fi
 
 CODEX_HOME="${CODEX_HOME:-/root/.codex}"
 PROMPT="${PROMPT:-請自我介紹}"
-mkdir -p "$CODEX_HOME"
+mkdir -p "$CODEX_HOME" || die "Unable to create CODEX_HOME."
 
 auth_file="$(mktemp "$CODEX_HOME/auth.XXXXXX")"
-trap 'rm -f "$auth_file"' EXIT
+auth_path="$CODEX_HOME/auth.json"
 
-if ! printf '%s' "$OAUTH" | base64 -d > "$auth_file"; then
+if [[ -e "$auth_path" ]]; then
-  echo "OAUTH must be valid base64 encoded Codex auth.json." >&2
+  die "Refusing to overwrite existing Codex auth.json."
-  exit 1
+fi
+
+if ! printf '%s\n' "$OAUTH" | base64 -d > "$auth_file"; then
+  die "OAUTH must be valid base64 encoded Codex auth.json."
 fi
 
 if ! jq -e 'type == "object"' "$auth_file" >/dev/null; then
-  echo "Decoded OAUTH must be a JSON object." >&2
+  die "Decoded OAUTH must be a JSON object."
-  exit 1
 fi
 
-mv "$auth_file" "$CODEX_HOME/auth.json"
+install -m 600 "$auth_file" "$auth_path"
-chmod 600 "$CODEX_HOME/auth.json"
+rm -f "$auth_file"
-trap - EXIT
 
 codex_output="$(mktemp)"
-trap 'rm -f "$codex_output"' EXIT
 
 set +e
 codex exec \
+  --skip-git-repo-check \
   --model "$MODEL" \
   "$PROMPT" 2>&1 | tee "$codex_output"
 codex_status="${PIPESTATUS[0]}"
 set -e
 
 if [[ -n "${GITHUB_OUTPUT:-}" ]]; then
-  output_delimiter="CODEX_OUTPUT_$(date +%s)_$$"
+  if [[ -r /proc/sys/kernel/random/uuid ]]; then
+    output_delimiter="CODEX_OUTPUT_$(cat /proc/sys/kernel/random/uuid)"
+  else
+    output_delimiter="CODEX_OUTPUT_$(mktemp -u XXXXXXXXXXXXXXXX)"
+  fi
 
   if [[ "$codex_status" -eq 0 ]]; then
     echo "status=completed" >> "$GITHUB_OUTPUT"