From fd13ebac8d954c48c342429d8614a2d92dc91c5c Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Thu, 2 Feb 2012 12:09:03 -0500 Subject: [PATCH] Fixed help documentation of sbtopts files. --- sbt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sbt b/sbt index 7930e53f9..e2db67998 100755 --- a/sbt +++ b/sbt @@ -254,12 +254,15 @@ Usage: $script_name [options] -java-home alternate JAVA_HOME # jvm options and output control - JAVA_OPTS environment variable, if unset uses "$java_opts" - SBT_OPTS environment variable, if unset uses "$default_sbt_opts" - .sbtopts if this file exists in the sbt root, it is prepended to the runner args - -Dkey=val pass -Dkey=val directly to the java runtime - -J-X pass option -X directly to the java runtime (-J is stripped) - -S-X add -X to sbt's scalacOptions (-J is stripped) + JAVA_OPTS environment variable, if unset uses "$java_opts" + SBT_OPTS environment variable, if unset uses "$default_sbt_opts" + .sbtopts if this file exists in the current directory, it is + prepended to the runner args + /etc/sbt/sbtopts if this file exists, it is prepended to the runner args + -Dkey=val pass -Dkey=val directly to the java runtime + -J-X pass option -X directly to the java runtime + (-J is stripped) + -S-X add -X to sbt's scalacOptions (-J is stripped) In the case of duplicated or conflicting options, the order above shows precedence: JAVA_OPTS lowest, command line options highest.