luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use JAVA_OPTS instead of java_opts.

This commit is contained in:
Stephen Nancekivell 2014-10-29 20:33:57 +11:00
parent 80616ea412
commit 10e95ef240
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/universal/bin/sbt-launch-lib.bash
View File

@ -73,9 +73,9 @@ addDebugger () {
} }
get_mem_opts () { 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. # 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 "" echo ""
else else
# a ham-fisted attempt to move some memory settings in concert # a ham-fisted attempt to move some memory settings in concert
@ -188,7 +188,7 @@ run() {
execRunner "$java_cmd" \ execRunner "$java_cmd" \
${SBT_OPTS:-$default_sbt_opts} \ ${SBT_OPTS:-$default_sbt_opts} \
$(get_mem_opts $sbt_mem) \ $(get_mem_opts $sbt_mem) \
${java_opts} \ ${JAVA_OPTS} \
${java_args[@]} \ ${java_args[@]} \
-jar "$sbt_jar" \ -jar "$sbt_jar" \
"${sbt_commands[@]}" \ "${sbt_commands[@]}" \