Skip to content

feat: add FreeBSD enhancement #67

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
ekzhang merged 3 commits into from
Sep 22, 2024
Merged

feat: add FreeBSD enhancement #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4655721
feat: add /usr/local/bin in search path
aokblast Jan 4, 2024
3ab0277
feat: add FreeBSD x86-64 cross compile support
aokblast Jan 4, 2024
2c30dad
Minor edits
ekzhang Sep 22, 2024
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
5 changes: 5 additions & 0 deletions Cross.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[target.x86_64-unknown-freebsd]
pre-build = [
"apt-get update",
"apt install -y protobuf-compiler",
]
7 changes: 6 additions & 1 deletion crates/sshx/src/terminal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ pub async fn get_default_shell() -> String {
return shell;
}
}
for shell in ["/bin/bash", "/bin/sh"] {
for shell in [
"/bin/bash",
"/bin/sh",
"/usr/local/bin/bash",
"/usr/local/bin/sh",
] {
if fs::metadata(shell).await.is_ok() {
return shell.to_string();
}
Expand Down
3 changes: 3 additions & 0 deletions scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@ cargo build --release --target x86_64-apple-darwin

cargo build --release --target aarch64-apple-darwin

cross build --release --target x86_64-unknown-freebsd

temp=$(mktemp)
targets=(
x86_64-unknown-linux-musl
aarch64-unknown-linux-musl
x86_64-apple-darwin
aarch64-apple-darwin
x86_64-unknown-freebsd
)
for target in "${targets[@]}"
do
Expand Down
1 change: 1 addition & 0 deletions static/get
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ set +e
case "$(uname -s)" in
Linux*) suffix="-unknown-linux-musl";;
Darwin*) suffix="-apple-darwin";;
FreeBSD*) suffix="-unknown-freebsd";;
*) echo "Unsupported OS $(uname -s)"; exit 1;;
esac

Expand Down