[2.x] fix: Fixes shutdownall (#9435)

**Problem**
sbt shutdown all requires --server.

**Solution**
Fix it so it doesn't need extra flag.
This commit is contained in:
eugene yokota 2026-07-11 16:04:01 -04:00 committed by Eugene Yokota
parent 14057ad32b
commit 891960e2ec
1 changed files with 13 additions and 6 deletions

19
sbt
View File

@ -554,6 +554,14 @@ checkWorkingDirectory() {
fi fi
} }
runShutdownAll() {
local sbt_processes=( $(jps -v | grep sbt-launch | cut -f1 -d ' ') )
for procId in "${sbt_processes[@]}"; do
kill -9 $procId
done
echoerr "shutdown ${#sbt_processes[@]} sbt processes"
}
run() { run() {
# Copy preloaded repo to user's preloaded directory # Copy preloaded repo to user's preloaded directory
syncPreloaded syncPreloaded
@ -590,12 +598,6 @@ run() {
echoerr "" echoerr ""
echoerr "[info] sbt runner (sbt-the-shell-script) is a runner to run any declared version of sbt." echoerr "[info] sbt runner (sbt-the-shell-script) is a runner to run any declared version of sbt."
echoerr "[info] Actual version of the sbt is declared using project/build.properties for each build." echoerr "[info] Actual version of the sbt is declared using project/build.properties for each build."
elif [[ $shutdownall ]]; then
local sbt_processes=( $(jps -v | grep sbt-launch | cut -f1 -d ' ') )
for procId in "${sbt_processes[@]}"; do
kill -9 $procId
done
echoerr "shutdown ${#sbt_processes[@]} sbt processes"
else else
checkWorkingDirectory checkWorkingDirectory
# run sbt # run sbt
@ -931,6 +933,11 @@ if [[ $print_sbt_script_version ]]; then
exit 0 exit 0
fi fi
if [[ $shutdownall ]]; then
runShutdownAll
exit 0
fi
java_version="$(jdk_version)" java_version="$(jdk_version)"
vlog "[process_args] java_version = '$java_version'" vlog "[process_args] java_version = '$java_version'"
checkJava17ForSbt2 checkJava17ForSbt2