From f9dacd0d6bb60bb1372d913bf929d7db8d036658 Mon Sep 17 00:00:00 2001
From: Trey Moen <50057480+greatgitsby@users.noreply.github.com>
Date: Sat, 5 Sep 2026 13:45:12 -0700
Subject: [PATCH] cabana: build binary directly, drop wrapper script (#38781)

---
 openpilot/tools/cabana/.gitignore              |  2 +-
 openpilot/tools/cabana/SConscript              |  2 +-
 openpilot/tools/cabana/cabana                  | 10 ----------
 openpilot/tools/cabana/tests/test_cabana_ui.py |  2 +-
 4 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100755 openpilot/tools/cabana/cabana

diff --git a/openpilot/tools/cabana/.gitignore b/openpilot/tools/cabana/.gitignore
index 788b286372..c59f393869 100644
--- a/openpilot/tools/cabana/.gitignore
+++ b/openpilot/tools/cabana/.gitignore
@@ -1,5 +1,5 @@
 bootstrap_icons.cc
 
-_cabana_ui
+cabana
 dbc/car_fingerprint_to_dbc.json
 tests/test_cabana
diff --git a/openpilot/tools/cabana/SConscript b/openpilot/tools/cabana/SConscript
index 81fd8877c4..0249a019bb 100644
--- a/openpilot/tools/cabana/SConscript
+++ b/openpilot/tools/cabana/SConscript
@@ -51,7 +51,7 @@ if arch == "Darwin":
   ui_env['FRAMEWORKS'] = ['OpenGL', 'Cocoa', 'IOKit', 'CoreFoundation', 'CoreVideo', 'CoreMedia', 'Security', 'VideoToolbox']
 else:
   ui_libs += ['GL', 'dl']
-cabana_ui = ui_env.Program('_cabana_ui', ui_objs, LIBS=ui_libs)
+cabana_ui = ui_env.Program('cabana', ui_objs, LIBS=ui_libs)
 
 if GetOption('extras'):
   cabana_core_test_env = env.Clone()
diff --git a/openpilot/tools/cabana/cabana b/openpilot/tools/cabana/cabana
deleted file mode 100755
index bdec614366..0000000000
--- a/openpilot/tools/cabana/cabana
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-ROOT="$(cd "$DIR/../../../" && pwd)"
-
-cd "$ROOT"
-scons -u "openpilot/tools/cabana/_cabana_ui" openpilot/cereal/messaging/bridge
-
-exec "$DIR/_cabana_ui" "$@"
diff --git a/openpilot/tools/cabana/tests/test_cabana_ui.py b/openpilot/tools/cabana/tests/test_cabana_ui.py
index 2cb0475041..aecd7e6ed7 100644
--- a/openpilot/tools/cabana/tests/test_cabana_ui.py
+++ b/openpilot/tools/cabana/tests/test_cabana_ui.py
@@ -8,6 +8,6 @@ CABANA_DIR = Path(__file__).parent.parent
 
 class TestCabanaUi(OpenpilotTestCase):
   def test_help(self):
-    result = subprocess.run(["./_cabana_ui", "-h"], cwd=CABANA_DIR, capture_output=True, text=True)
+    result = subprocess.run(["./cabana", "-h"], cwd=CABANA_DIR, capture_output=True, text=True)
     assert result.returncode == 0, result.stderr
     assert "Usage:" in result.stderr