Skip to content

Commit d8686fd

Browse files
authored
Merge pull request #165 from cbusillo/cleanup/trim-package-manager-doctor-hints
Trim package-manager doctor hints
2 parents 7a2a647 + f27c650 commit d8686fd

1 file changed

Lines changed: 2 additions & 44 deletions

File tree

code-rs/cli/src/main.rs

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,50 +1522,8 @@ async fn doctor_main() -> anyhow::Result<()> {
15221522
show_versions("code --version by path", &code_paths).await;
15231523
show_versions("coder --version by path", &coder_paths).await;
15241524

1525-
// Detect Bun shims
1526-
let bun_home = env::var("BUN_INSTALL").ok().or_else(|| {
1527-
env::var("HOME").ok().map(|h| format!("{}/.bun", h))
1528-
});
1529-
if let Some(bun) = bun_home {
1530-
let bun_bin = format!("{}/bin", bun);
1531-
let bun_coder = format!("{}/coder", bun_bin);
1532-
if coder_paths.iter().any(|p| p == &bun_coder) {
1533-
println!("\nBun shim detected for 'coder': {}", bun_coder);
1534-
println!("Suggestion: remove old Bun global with: bun remove -g @just-every/code");
1535-
}
1536-
let bun_code = format!("{}/code", bun_bin);
1537-
if code_paths.iter().any(|p| p == &bun_code) {
1538-
println!("Bun shim detected for 'code': {}", bun_code);
1539-
println!("Suggestion: prefer 'coder' or remove Bun shim if it conflicts.");
1540-
}
1541-
}
1542-
1543-
// Detect Homebrew overshadow of VS Code
1544-
#[cfg(target_os = "macos")]
1545-
{
1546-
let brew_code = code_paths.iter().find(|p| p.contains("/homebrew/bin/code") || p.contains("/Cellar/code/"));
1547-
let vscode_code = code_paths.iter().find(|p| p.contains("/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code"));
1548-
if brew_code.is_some() && vscode_code.is_some() {
1549-
println!("\nHomebrew 'code' precedes VS Code CLI in PATH.");
1550-
println!("Suggestion: uninstall Homebrew formula 'code' (brew uninstall code) or reorder PATH so /usr/local/bin comes before /usr/local/homebrew/bin.");
1551-
}
1552-
}
1553-
1554-
// npm global hints
1555-
let npm_root = run_cmd("npm", &["root", "-g"]).await;
1556-
let npm_prefix = run_cmd("npm", &["prefix", "-g"]).await;
1557-
if !npm_root.is_empty() {
1558-
println!("\nnpm root -g: {}", npm_root);
1559-
}
1560-
if !npm_prefix.is_empty() {
1561-
println!("npm prefix -g: {}", npm_prefix);
1562-
}
1563-
1564-
println!("\nIf versions differ, remove older installs and keep one package manager:");
1565-
println!(" - Bun: bun remove -g @just-every/code");
1566-
println!(" - npm/pnpm: npm uninstall -g @just-every/code");
1567-
println!(" - Homebrew: brew uninstall code");
1568-
println!(" - Prefer using 'coder' to avoid conflicts with VS Code's 'code'.");
1525+
println!("\nIf versions differ, remove older PATH entries or reorder PATH so the intended Code binary appears first.");
1526+
println!("Run `code update-check` from the intended binary to inspect the current GitHub Release update source.");
15691527

15701528
Ok(())
15711529
}

0 commit comments

Comments
 (0)