From 53e008a25d6f32a67e62f4bf0cd21f0c08aac92c Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 30 Jul 2018 18:43:53 -0400
Subject: [PATCH 1/2] Revert "Handle SBT_OPTS in bash"

This reverts commit ea93158ae3e76e1abb6dd383e4d88fccd6bc9410.
---
 src/universal/bin/sbt-launch-lib.bash | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/src/universal/bin/sbt-launch-lib.bash b/src/universal/bin/sbt-launch-lib.bash
index a69bff1d8..e7155a148 100755
--- a/src/universal/bin/sbt-launch-lib.bash
+++ b/src/universal/bin/sbt-launch-lib.bash
@@ -253,24 +253,6 @@ checkJava() {
   fi
 }
 
-convertSbtOpts () {
-  while [[ $# -gt 0 ]]; do
-    case "$1" in
-      -no-colors) converted_opts="${converted_opts} -Dsbt.log.noformat=true" && shift ;;
-       -no-share) converted_opts="${converted_opts} $noshare_opts" && shift ;;
-      -no-global) converted_opts="${converted_opts} -Dsbt.global.base=$(pwd)/project/.sbtboot" && shift ;;
-       -sbt-boot) require_arg path "$1" "$2" && converted_opts="${converted_opts} -Dsbt.boot.directory=$2" && shift 2 ;;
-        -sbt-dir) require_arg path "$1" "$2" && converted_opts="${converted_opts} -Dsbt.global.base=$2" && shift 2 ;;
-      -debug-inc) converted_opts="${converted_opts} -Dxsbt.inc.debug=true" && shift ;;
-          -batch) exec </dev/null && shift ;;
-
-     -sbt-create) sbt_create=true && shift ;;
-
-               *) addResidual "$1" && shift ;;
-    esac
-  done
-}
-
 copyRt() {
   local at_least_9="$(expr $java_version ">=" 9)"
   if [[ "$at_least_9" == "1" ]]; then
@@ -312,14 +294,6 @@ run() {
   # TODO - java check should be configurable...
   checkJava "6"
 
-  # handle SBT_OPTS options
-  if [ -n "$SBT_OPTS" ]; then
-    converted_opts=""
-    arrayed_sbt_opts=($SBT_OPTS)
-    convertSbtOpts ${arrayed_sbt_opts[@]}
-    SBT_OPTS=$converted_opts
-  fi
-
   # Java 9 support
   copyRt
 

From 4a8b1b97dbdda45eb10b0dfe08a8898f83cd10f3 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 30 Jul 2018 18:52:45 -0400
Subject: [PATCH 2/2] Test more SBT_OPTS

---
 citest/test.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/citest/test.sh b/citest/test.sh
index 64d40c80a..5569842aa 100755
--- a/citest/test.sh
+++ b/citest/test.sh
@@ -17,6 +17,10 @@ java -version
 mkdir freshly-baked
 unzip -qo ../target/universal/sbt.zip -d ./freshly-baked
 
-SBT_OPTS=-Dfile.encoding=UTF-8
+export SBT_OPTS=-Dfile.encoding=UTF-8
+
+./freshly-baked/sbt/bin/sbt about run
+
+export SBT_OPTS="-Dfile.encoding=UTF-8 -Xms2048M -Xmx2048M -Xss2M -XX:MaxPermSize=512M"
 
 ./freshly-baked/sbt/bin/sbt about run