Skip to content

Add fallback search paths for Unix utilities #931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2025
Merged

Add fallback search paths for Unix utilities #931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions Sources/SWBCore/Settings/Settings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,43 @@ extension WorkspaceContext {
}
}

// Add the system-level bin directories common to most Unix-like platforms if they weren't already present.
// This is not an exhaustive list that exactly matches the platform defaults, but generally aims to follow the same relative ordering.
switch core.hostOperatingSystem {
case .macOS:
paths.append(contentsOf: [
.root.join("usr").join("bin"),
.root.join("bin"),
.root.join("usr").join("sbin"),
.root.join("sbin"),
])
case .linux:
paths.append(contentsOf: [
.root.join("usr").join("sbin"),
.root.join("usr").join("bin"),
.root.join("sbin"),
.root.join("bin"),
])
case .freebsd:
paths.append(contentsOf: [
.root.join("sbin"),
.root.join("bin"),
.root.join("usr").join("sbin"),
.root.join("usr").join("bin"),
])
case .openbsd:
paths.append(contentsOf: [
.root.join("bin"),
.root.join("sbin"),
.root.join("usr").join("bin"),
.root.join("usr").join("sbin"),
])
case .android:
paths.append(.root.join("system").join("bin"))
case .iOS, .tvOS, .watchOS, .visionOS, .windows, .unknown:
break
}

return StackedSearchPath(paths: [Path](paths), fs: fs)
}
}
Expand Down