From 6649b29e19d8dcef647f11d349e44184ac4f7d2a Mon Sep 17 00:00:00 2001
From: sfaber34 <sfaber34@gmail.com>
Date: Thu, 9 May 2024 16:53:17 -0600
Subject: [PATCH] Fix clients not exiting correctly again

---
 packages/nextjs/public/bgnodes.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/nextjs/public/bgnodes.js b/packages/nextjs/public/bgnodes.js
index bcd1aaf..0c8e604 100644
--- a/packages/nextjs/public/bgnodes.js
+++ b/packages/nextjs/public/bgnodes.js
@@ -109,7 +109,6 @@ function checkMacLinuxPrereqs(platform) {
     execSync("brew install openssl", { stdio: "inherit" });
   }
   // execSync(`npm install -g blessed blessed-contrib`, { stdio: "inherit" });
-  process.exit(0);
 }
 
 function checkWindowsPrereqs() {
@@ -411,20 +410,17 @@ function startChain(executionClient, consensusClient, jwtDir, platform) {
 
   // Quit on Escape, q, or Control-C.
   screen.key(["escape", "q", "C-c"], function (ch, key) {
-    const gethPID = execSync(`pgrep geth`).toString().trim();
-    if (gethPID !== "") {
+    // TODO: Make Windows processes exit
+    if (executionClient === "geth") {
       execSync("pkill geth", { stdio: "ignore" });
-    }
-
-    const rethPID = execSync(`pgrep reth`).toString().trim();
-    if (rethPID !== "") {
+    } else if (executionClient === "reth") {
       execSync("pkill reth", { stdio: "ignore" });
     }
 
-    const lighthousePID = execSync(`pgrep lighthouse`).toString().trim();
-    if (lighthousePID !== "") {
+    if (consensusClient === "lighthouse") {
       execSync("pkill lighthouse", { stdio: "ignore" });
     }
+
     return process.exit(0);
   });