resolve code mode host from install context

This commit is contained in:
Channing Conger
2026-07-10 00:29:53 +00:00
parent 8fc5ae3ddf
commit 941eba8ea7
5 changed files with 41 additions and 80 deletions
+6 -2
View File
@@ -881,7 +881,9 @@ update_visible_command() {
replace_path_with_symlink "$BIN_PATH" "$CURRENT_LINK/$codex_relative_path" "$tmp_link"
if [ "$os" = "darwin" ] && [ -x "$release_dir/$code_mode_host_relative_path" ]; then
if [ "$os" = "darwin" ] &&
[ "$code_mode_host_relative_path" = "bin/codex-code-mode-host" ] &&
[ -x "$release_dir/$code_mode_host_relative_path" ]; then
replace_path_with_symlink \
"$CODE_MODE_HOST_BIN_PATH" \
"$CURRENT_LINK/$code_mode_host_relative_path" \
@@ -899,7 +901,9 @@ update_visible_command() {
verify_visible_command() {
"$BIN_PATH" --version >/dev/null
if [ "$os" = "darwin" ] && [ "$install_layout" = "package" ]; then
if [ "$os" = "darwin" ] && [ "$install_layout" = "package" ] &&
[ "$(package_code_mode_host_relative_path "$release_dir")" = \
"bin/codex-code-mode-host" ]; then
[ -x "$CODE_MODE_HOST_BIN_PATH" ]
fi
}
+11 -6
View File
@@ -88,7 +88,9 @@ class InstallShTest(unittest.TestCase):
self.assertIn("/codex-npm-", requests[1])
self.assertNotIn("codex-package_SHA256SUMS", requests[1])
def test_macos_install_exposes_code_mode_host_beside_codex(self) -> None:
def test_macos_install_only_exposes_legacy_code_mode_host_beside_codex(
self,
) -> None:
for host_dir in ("codex-resources", "bin"):
with (
self.subTest(host_dir=host_dir),
@@ -116,11 +118,14 @@ class InstallShTest(unittest.TestCase):
self.assertEqual(
os.readlink(codex_path), str(current / "bin" / "codex")
)
self.assertEqual(
os.readlink(host_path),
str(current / host_dir / "codex-code-mode-host"),
)
self.assertTrue(os.access(host_path, os.X_OK))
if host_dir == "bin":
self.assertEqual(
os.readlink(host_path),
str(current / host_dir / "codex-code-mode-host"),
)
self.assertTrue(os.access(host_path, os.X_OK))
else:
self.assertFalse(host_path.exists())
def run_installer(