[senamakel]

Follow-up to #1100 / #1102. Both prior fixes left the cleanup wired through a bash trap. The most recent staging run still exits 1 right after a successful symbol upload:

```
[INFO] Successfully uploaded symbols for openhuman@0.53.9+dc4f91a151ca
scripts/upload_sentry_symbols.sh: line 247: tmp_dir: unbound variable
[INFO] === Upload complete ===
Error: Process completed with exit code 1
```

Root cause

Bash traps are globally scoped, not function-scoped. A trap '... \$tmp_dir ...' RETURN defined inside ensure_sentry_cli fires on EVERY subsequent function return — including main's at end-of-script. By that point local tmp_dir is gone and `set -u` errors out. EXIT has the same scoping problem; there is no clean way to limit a bash trap to one function's lifetime.

Fix

Drop the trap entirely.

• mv already empties tmp_dir on the success path; the function ends with an explicit rm -rf "$tmp_dir" to remove the now-empty directory.
• Each early-exit branch (download fail, empty file, HTML page, install-dir unwritable) gets an inline rm -rf "$tmp_dir" before its exit 1.

Worst case if set -e triggers between mktemp and the next inline cleanup, /tmp leaks one directory until the OS sweeps it.

Test plan

• Re-trigger Release (Staging) and confirm the Upload Tauri shell debug symbols step exits 0 cleanly after "Successfully uploaded symbols".
• Confirm no tmp_dir: unbound variable regression appears anywhere in subsequent runs.

Summary by CodeRabbit

• Chores
  • Improved internal cleanup handling in the Sentry symbols upload script to prevent temporary file accumulation.

[coderabbitai]

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 973ed7e1-ffae-432b-98e2-d99e8cf44450

📥 Commits

Reviewing files that changed from the base of the PR and between dc4f91a and b6e8dfc.

📒 Files selected for processing (1)

• scripts/upload_sentry_symbols.sh

---

📝 Walkthrough

Walkthrough

The ensure_sentry_cli function in scripts/upload_sentry_symbols.sh was refactored to replace a function-scoped trap-based cleanup mechanism with explicit rm -rf "$tmp_dir" calls on each error exit path and after successful installation. This ensures the temporary directory is always removed without relying on trap handlers.

Changes

Cleanup Architecture Refactoring

Layer / File(s)	Summary
Temp Directory Setup scripts/upload_sentry_symbols.sh (lines 115–126)	Replaced trap ... RETURN cleanup pattern with explicit tmp_dir="$(mktemp -d)" declaration to support inline cleanup in subsequent error paths.
Download Error Handling scripts/upload_sentry_symbols.sh (lines 128–149)	Added explicit rm -rf "$tmp_dir" cleanup before exit when curl/wget is unavailable, download fails, or network error occurs.
Content Validation Error Handling scripts/upload_sentry_symbols.sh (lines 150–161)	Added explicit temp directory removal when downloaded content is empty or appears to be HTML instead of a binary archive.
Installation & Cleanup scripts/upload_sentry_symbols.sh (lines 175–186)	Added explicit rm -rf "$tmp_dir" after successful installation (including fallback paths) and on installation failure, removing the now-empty temp directory to prevent per-run leaks.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Possibly related PRs

• fix(devops): upload Rust debug symbols to Sentry during Tauri build #890: Introduced the original scripts/upload_sentry_symbols.sh script including the ensure_sentry_cli function; this PR refactors its cleanup logic from trap-based to explicit handling.

Poem

🐰 A trap once caught the cleanup task,
But now the paths all wear a mask—
Of rm -rf commands, bright and clear,
No temp dirs linger, never fear!

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Review rate limit: 4/5 reviews remaining, refill in 12 minutes.}

_{Comment @coderabbitai help to get the list of available commands and usage tips.}