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