From cdec5b3840116f0d5010f7483dc62ff9cd443a4c Mon Sep 17 00:00:00 2001
From: Scott Moore <59924790+somoore@users.noreply.github.com>
Date: Tue, 3 Nov 2026 12:43:40 -0600
Subject: [PATCH] fix: finish the two Codex findings from PR #35/#38

- uninstall.sh also terminates legacy "ldoom open" proxy processes, so an
  upgrade no longer leaves a stale proxy holding the port
- deploy.sh exports HELLBOX_HOME before invoking the CLI, so a stale
  LAMBDADOOM_HOME cannot redirect build/up/open at legacy config
---
 deploy.sh    | 5 ++++-
 uninstall.sh | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index b786593..f601109 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -211,7 +211,10 @@ aws_account_id     = "$ACCOUNT_ID"
 EOF
 say "Wrote $HOME_DIR/config.toml"
 
-# CLI.
+# CLI. Export HELLBOX_HOME so the CLI reads the config this script just wrote:
+# without it, a legacy LAMBDADOOM_HOME still exported from an old install would
+# make the CLI resolve the old ~/.lambdadoom config/state instead of this one.
+export HELLBOX_HOME="$HOME_DIR"
 HELLBOX="$(resolve_hellbox)"
 say "Using hellbox CLI: $HELLBOX"
 
diff --git a/uninstall.sh b/uninstall.sh
index 372f993..bf36028 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -164,9 +164,11 @@ remove_local_home(){
 
 # Stop a running loopback proxy (`hellbox open`) if one is still up — uninstall
 # should be self-contained whether or not the user Ctrl-C'd it first. Targets only
-# the hellbox proxy by command pattern; harmless if none is running.
+# the hellbox/ldoom proxy by command pattern; harmless if none is running.
+# Legacy LambdaDoom installs still run the proxy as `ldoom open`, so match both
+# binary names (-f scans the full command line).
 if command -v pkill >/dev/null 2>&1; then
-  if pkill -f 'hellbox(\.exe)? open' 2>/dev/null; then
+  if pkill -f '(hellbox|ldoom)(\.exe)? open' 2>/dev/null; then
     say "Stopped the running hellbox proxy"
   fi
 fi