From 10e95ef2406c45f8e2bc49ada18e304eb412a8ed Mon Sep 17 00:00:00 2001
From: Stephen Nancekivell <stephen@redballoon.com.au>
Date: Wed, 29 Oct 2014 20:33:57 +1100
Subject: [PATCH] use JAVA_OPTS instead of java_opts.

---
 src/universal/bin/sbt-launch-lib.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/universal/bin/sbt-launch-lib.bash b/src/universal/bin/sbt-launch-lib.bash
index aec86baee..427aa5b0c 100755
--- a/src/universal/bin/sbt-launch-lib.bash
+++ b/src/universal/bin/sbt-launch-lib.bash
@@ -73,9 +73,9 @@ addDebugger () {
 }
 
 get_mem_opts () {
-  # if we detect any of these settings in ${java_opts} we need to NOT output our settings.
+  # if we detect any of these settings in ${JAVA_OPTS} we need to NOT output our settings.
   # The reason is the Xms/Xmx, if they don't line up, cause errors.
-  if [[ "${java_opts}" == *-Xmx* ]] || [[ "${java_opts}" == *-Xms* ]] || [[ "${java_opts}" == *-XX:MaxPermSize* ]] || [[ "${java_opts}" == *-XX:MaxMetaspaceSize* ]] || [[ "${java_opts}" == *-XX:ReservedCodeCacheSize* ]]; then
+  if [[ "${JAVA_OPTS}" == *-Xmx* ]] || [[ "${JAVA_OPTS}" == *-Xms* ]] || [[ "${JAVA_OPTS}" == *-XX:MaxPermSize* ]] || [[ "${JAVA_OPTS}" == *-XX:MaxMetaspaceSize* ]] || [[ "${JAVA_OPTS}" == *-XX:ReservedCodeCacheSize* ]]; then
      echo ""
   else
     # a ham-fisted attempt to move some memory settings in concert
@@ -188,7 +188,7 @@ run() {
   execRunner "$java_cmd" \
     ${SBT_OPTS:-$default_sbt_opts} \
     $(get_mem_opts $sbt_mem) \
-  	  ${java_opts} \
+  	  ${JAVA_OPTS} \
     ${java_args[@]} \
     -jar "$sbt_jar" \
     "${sbt_commands[@]}" \