Merge pull request #8446 from Angel98518/fix-sbt-version-flag

[2.x] Fix --sbt-version to expand to -Dsbt.version
This commit is contained in:
eugene yokota 2026-01-08 18:16:14 -05:00 committed by GitHub
commit 997ad9619a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions

4
sbt
View File

@ -550,7 +550,7 @@ run() {
syncPreloaded
# no jar? download it.
[[ -f "$sbt_jar" ]] || acquire_sbt_jar "$sbt_version" || {
[[ -f "$sbt_jar" ]] || acquire_sbt_jar || {
exit 1
}
@ -746,7 +746,7 @@ process_args () {
sbt_cache="$2" &&
addJava "-Dsbt.global.localcache=$2" &&
shift 2 ;;
-sbt-version|--sbt-version) require_arg version "$1" "$2" && sbt_version="$2" && shift 2 ;;
-sbt-version|--sbt-version) require_arg version "$1" "$2" && addJava "-Dsbt.version=$2" && shift 2 ;;
-java-home|--java-home) require_arg path "$1" "$2" &&
java_cmd="$2/bin/java" &&
export JAVA_HOME="$2" &&