Merge branch 'main' into ekzhang/windows-support

Cross.toml

@@ -0,0 +1,5 @@
+[target.x86_64-unknown-freebsd]
+pre-build = [
+ "apt-get update",
+ "apt install -y protobuf-compiler",
+]

crates/sshx/src/terminal/unix.rs

@@ -25,7 +25,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();
  }

scripts/release.sh

@@ -35,6 +35,9 @@ cargo build --release --target x86_64-apple-darwin
 # aarch64-apple-darwin: for macOS on Apple Silicon
 cargo build --release --target aarch64-apple-darwin
 
+# x86_64-unknown-freebsd: for FreeBSD
+cross build --release --target x86_64-unknown-freebsd
+
 # *-pc-windows-msvc: for Windows, requires cargo-xwin
 cargo xwin build -p sshx --release --target x86_64-pc-windows-msvc
 cargo xwin build -p sshx --release --target i686-pc-windows-msvc
@@ -48,6 +51,7 @@ targets=(
  armv7-unknown-linux-musleabihf
  x86_64-apple-darwin
  aarch64-apple-darwin
+ x86_64-unknown-freebsd
  x86_64-pc-windows-msvc
  i686-pc-windows-msvc
  aarch64-pc-windows-msvc

static/get

@@ -14,6 +14,7 @@ set +e
 case "$(uname -s)" in
  Linux*) suffix="-unknown-linux-musl";;
  Darwin*) suffix="-apple-darwin";;
+ FreeBSD*) suffix="-unknown-freebsd";;
  MINGW*|MSYS*|CYGWIN*)
  echo "You are on Windows. Please visit sshx.io to download the executable.";
  exit 1;;