marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(shell): prevent GUI cmux from shadowing CLI on PATH

Browse source
This commit is contained in:
austinpower1258 2026-02-26 14:43:03 -08:00
parent b0bf4ef514
commit 2fd5d06bac
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Resources/shell-integration/cmux-bash-integration.bash
View file

@ -236,15 +236,17 @@ _cmux_install_prompt_command() {
fi
}
# Ensure Resources/bin is at the front of PATH. Shell init (.bashrc/.bash_profile)
# may prepend other dirs that push our wrapper behind the system claude binary.
# Ensure Resources/bin is at the front of PATH, and remove the app's
# Contents/MacOS entry so the GUI cmux binary cannot shadow the CLI cmux.
# Shell init (.bashrc/.bash_profile) may prepend other dirs after launch.
_cmux_fix_path() {
if [[ -n "${GHOSTTY_BIN_DIR:-}" ]]; then
local bin_dir="${GHOSTTY_BIN_DIR%/MacOS}"
bin_dir="${bin_dir}/Resources/bin"
local gui_dir="${GHOSTTY_BIN_DIR%/}"
local bin_dir="${gui_dir%/MacOS}/Resources/bin"
if [[ -d "$bin_dir" ]]; then
local new_path=":${PATH}:"
new_path="${new_path//:${bin_dir}:/:}"
new_path="${new_path//:${gui_dir}:/:}"
new_path="${new_path#:}"
new_path="${new_path%:}"
PATH="${bin_dir}:${new_path}"

12
Resources/shell-integration/cmux-zsh-integration.zsh
View file

@ -368,17 +368,19 @@ _cmux_precmd() {
fi
}
# Ensure Resources/bin is at the front of PATH. Shell init (.zprofile/.zshrc)
# may prepend other dirs that push our wrapper behind the system claude binary.
# Ensure Resources/bin is at the front of PATH, and remove the app's
# Contents/MacOS entry so the GUI cmux binary cannot shadow the CLI cmux.
# Shell init (.zprofile/.zshrc) may prepend other dirs after launch.
# We fix this once on first prompt (after all init files have run).
_cmux_fix_path() {
if [[ -n "${GHOSTTY_BIN_DIR:-}" ]]; then
local bin_dir="${GHOSTTY_BIN_DIR%/MacOS}"
bin_dir="${bin_dir}/Resources/bin"
local gui_dir="${GHOSTTY_BIN_DIR%/}"
local bin_dir="${gui_dir%/MacOS}/Resources/bin"
if [[ -d "$bin_dir" ]]; then
# Remove existing entry and re-prepend.
# Remove existing entries and re-prepend the CLI bin dir.
local -a parts=("${(@s/:/)PATH}")
parts=("${(@)parts:#$bin_dir}")
parts=("${(@)parts:#$gui_dir}")
PATH="${bin_dir}:${(j/:/)parts}"
fi
fi