From 69fa196803223a7b1f420e6a873f9dba17065ea7 Mon Sep 17 00:00:00 2001
From: eugene yokota <eed3si9n@gmail.com>
Date: Sun, 28 Jun 2026 15:30:54 -0400
Subject: [PATCH] [2.x] fix: Fixes sbt runner openbsd support (#9394)

**Problem**
sbt runner script defaults to sbtn, even on the operating system
where sbtn is not available.

**Solution**
This fallbacks to the jvm client.
---
 .../src/test/scala/ExtendedRunnerTest.scala   | 17 +++++
 sbt                                           | 73 +++++++++++--------
 2 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/launcher-package/integration-test/src/test/scala/ExtendedRunnerTest.scala b/launcher-package/integration-test/src/test/scala/ExtendedRunnerTest.scala
index 90016e224..5e6710040 100755
--- a/launcher-package/integration-test/src/test/scala/ExtendedRunnerTest.scala
+++ b/launcher-package/integration-test/src/test/scala/ExtendedRunnerTest.scala
@@ -31,6 +31,14 @@ object ExtendedRunnerTest extends BasicTestSuite:
       "JAVA_OPTS" -> "",
       "SBT_OPTS" -> ""
     )
+  def sbtProcessLikeBsd(args: String*) =
+    Process(
+      launcherCmd ++ args,
+      IntegrationTestPaths.citestDir("citest"),
+      "JAVA_OPTS" -> "",
+      "SBT_OPTS" -> "",
+      "OSTYPE" -> "openbsd7.9"
+    )
 
   test("sbt runs") {
     assert(sbtScript.exists)
@@ -145,6 +153,15 @@ object ExtendedRunnerTest extends BasicTestSuite:
     ()
   }
 
+  test("sbt falls back to JVM client on unsupported platform") {
+    if isWindows || isMac then ()
+    else
+      val out = sbtProcessLikeBsd("--client", "--no-colors", "compile").!!.linesIterator.toList
+      assert(out.exists { _.contains("server was not detected") })
+      sbtProcessLikeBsd("--client", "--no-colors", "shutdown").!
+    ()
+  }
+
   // Test for issue #6485: Test `sbt --client` startup
   // https://github.com/sbt/sbt/issues/6485
   test("sbt --client startup time") {
diff --git a/sbt b/sbt
index 58e60135f..c06b85428 100755
--- a/sbt
+++ b/sbt
@@ -203,8 +203,7 @@ acquire_sbtn () {
       archive_target="$p/sbtn-${arch}-pc-linux-${sbtn_v}.tar.gz"
       url="https://github.com/sbt/sbtn-dist/releases/download/v${sbtn_v}/sbtn-${arch}-pc-linux-${sbtn_v}.tar.gz"
     else
-      echoerr_error "sbtn is not supported on $arch"
-      exit 2
+      return 1
     fi
   elif [[ "$OSTYPE" == "darwin"* ]]; then
     arch="universal"
@@ -215,8 +214,7 @@ acquire_sbtn () {
     archive_target="$p/sbtn-x86_64-pc-win32-${sbtn_v}.zip"
     url="https://github.com/sbt/sbtn-dist/releases/download/v${sbtn_v}/sbtn-x86_64-pc-win32-${sbtn_v}.zip"
   else
-    echoerr_error "sbtn is not supported on $OSTYPE"
-    exit 2
+    return 1
   fi
 
   if [[ -f "$target" ]]; then
@@ -808,7 +806,7 @@ process_args () {
           -d|-debug|--debug) sbt_debug=1 && addSbt "-debug" && shift ;;
            -client|--client) use_sbtn=1 && shift ;;
                    --server) use_sbtn=0 && shift ;;
-               --jvm-client) use_sbtn=0 && use_jvm_client=1 && addSbt "--client" && shift ;;
+               --jvm-client) use_sbtn=0 && use_jvm_client=1 && shift ;;
      --no-hide-jdk-warnings) hide_jdk_warnings=0 && shift ;;
 
                  -mem|--mem) require_arg integer "$1" "$2" && addMemory "$2" && shift 2 ;;
@@ -906,13 +904,17 @@ detectNativeClient() {
   fi
 }
 
-# Run native client if build.properties points to 1.4+ and has SBT_NATIVE_CLIENT
-isRunNativeClient() {
+# Run client (sbtn or jvm verion) if build.properties points to 1.4+ and has SBT_NATIVE_CLIENT
+isRunClient() {
   # sbt new/init should not use native client as it needs to run outside a project
   if [[ "$sbt_new" == "true" ]]; then
     echo "false"
     return
   fi
+  if [[ "$use_jvm_client" == "1" ]]; then
+    echo "true"
+    return
+  fi
   sbtV="$build_props_sbt_version"
   [[ "$sbtV" == "" ]] && sbtV="$init_sbt_version"
   [[ "$sbtV" == "" ]] && sbtV="0.0.0"
@@ -936,25 +938,40 @@ isRunNativeClient() {
   fi
 }
 
-runNativeClient() {
-  vlog "[debug] running native client"
-  detectNativeClient
-  [[ -f "$sbtn_command" ]] || acquire_sbtn "$sbtn_version" || {
-    exit 1
-  }
-  for i in "${!original_args[@]}"; do
-    if [[ "${original_args[i]}" = "--client" ]]; then
-      unset 'original_args[i]'
-    fi
-  done
-
-  if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
-    sbt_script="$0.bat"
-  else
-    sbt_script="$0"
+runClient() {
+  if [[ "$use_jvm_client" != "1" ]]; then
+    detectNativeClient
+    [[ -f "$sbtn_command" ]] || acquire_sbtn "$sbtn_version" || {
+      use_jvm_client="1"
+    }
+  fi
+  if [[ "$use_jvm_client" == "1" ]]; then
+    vlog "[debug] running jvm client"
+    addSbt "--client"
+    addDefaultMemory
+    addSbtScriptProperty
+    addJdkWorkaround
+    set -- "${residual_args[@]}"
+    argumentCount=$#
+    run
+  else
+    vlog "[debug] running native client"
+    set -- "${residual_args[@]}"
+    argumentCount=$#
+    for i in "${!original_args[@]}"; do
+      if [[ "${original_args[i]}" = "--client" ]]; then
+        unset 'original_args[i]'
+      fi
+    done
+
+    if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
+      sbt_script="$0.bat"
+    else
+      sbt_script="$0"
+    fi
+    sbt_script=${sbt_script/ /%20}
+    execRunner "$sbtn_command" "--sbt-script=$sbt_script" "${original_args[@]}"
   fi
-  sbt_script=${sbt_script/ /%20}
-  execRunner "$sbtn_command" "--sbt-script=$sbt_script" "${original_args[@]}"
 }
 
 original_args=("$@")
@@ -1025,10 +1042,8 @@ java_version="$(jdk_version)"
 vlog "[process_args] java_version = '$java_version'"
 checkJava17ForSbt2
 
-if [[ "$(isRunNativeClient)" == "true" ]] && [[ -z "$print_version" ]]; then
-  set -- "${residual_args[@]}"
-  argumentCount=$#
-  runNativeClient
+if [[ "$(isRunClient)" == "true" ]] && [[ -z "$print_version" ]]; then
+  runClient
 else
   addDefaultMemory
   addSbtScriptProperty