From 3aa2f5eb7513d02a890e2dc6139fb3b14da5dc69 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Sun, 25 Oct 2020 17:10:40 -0700 Subject: [PATCH 1/3] Pass verbose flag to sbtn when running sbt --client --- src/universal/bin/sbt.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/src/universal/bin/sbt.bat b/src/universal/bin/sbt.bat index e868271ba..9a65ed3a1 100755 --- a/src/universal/bin/sbt.bat +++ b/src/universal/bin/sbt.bat @@ -644,6 +644,7 @@ set "_SBTNCMD=!SBT_BIN_DIR!sbtn-x86_64-pc-win32.exe" if defined sbt_args_verbose ( echo # running native client if not "%~1" == "" ( call :echolist %* ) + set "SBT_ARGS=-v !SBT_ARGS!" ) rem Microsoft Visual C++ 2010 SP1 Redistributable Package (x64) is required From ff638e36bca4d1c57f10701eb6c6423bb425beb4 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Sun, 25 Oct 2020 17:10:55 -0700 Subject: [PATCH 2/3] Set sbt script parameter for sbt.bat This brings parity with the bash script. --- src/universal/bin/sbt.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/src/universal/bin/sbt.bat b/src/universal/bin/sbt.bat index 9a65ed3a1..33d0d8b4c 100755 --- a/src/universal/bin/sbt.bat +++ b/src/universal/bin/sbt.bat @@ -646,6 +646,7 @@ if defined sbt_args_verbose ( if not "%~1" == "" ( call :echolist %* ) set "SBT_ARGS=-v !SBT_ARGS!" ) +set "SBT_ARGS=--sbt-script=!SBT_BIN_DIR!sbt.bat %SBT_ARGS%" rem Microsoft Visual C++ 2010 SP1 Redistributable Package (x64) is required rem https://www.microsoft.com/en-us/download/details.aspx?id=13523 From 9ffddfbd25bada20efe9c2177c27f80a6bdc90eb Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Sun, 25 Oct 2020 17:11:07 -0700 Subject: [PATCH 3/3] Pass the sanitized args to thin client in sbt.bat Passing the unsanitized arguments was problematic in sbt.bat because it caused sbt --client to run sbtn with --client as a parameter. This caused sbtn to launch sbt with the --client which caused a loop. This manifested as a weird error about not being able to get the console mode. --- src/universal/bin/sbt.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/universal/bin/sbt.bat b/src/universal/bin/sbt.bat index 33d0d8b4c..a651eecb2 100755 --- a/src/universal/bin/sbt.bat +++ b/src/universal/bin/sbt.bat @@ -650,7 +650,7 @@ set "SBT_ARGS=--sbt-script=!SBT_BIN_DIR!sbt.bat %SBT_ARGS%" rem Microsoft Visual C++ 2010 SP1 Redistributable Package (x64) is required rem https://www.microsoft.com/en-us/download/details.aspx?id=13523 -"!_SBTNCMD!" %* +"!_SBTNCMD!" %SBT_ARGS% goto :eof