|
Lines 1-20
Link Here
|
| 1 |
--- bin/sbt.orig 2016-10-28 17:46:00 UTC |
1 |
--- bin/sbt.orig 2017-09-08 07:31:36 UTC |
| 2 |
+++ bin/sbt |
2 |
+++ bin/sbt |
| 3 |
@@ -62,7 +62,7 @@ cygwinpath() { |
3 |
@@ -63,7 +63,7 @@ cygwinpath() { |
| 4 |
|
4 |
|
| 5 |
declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy" |
5 |
declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy" |
| 6 |
declare -r sbt_opts_file=".sbtopts" |
6 |
declare -r sbt_opts_file=".sbtopts" |
| 7 |
-declare -r etc_sbt_opts_file="${sbt_home}/conf/sbtopts" |
7 |
-declare -r etc_sbt_opts_file="/etc/sbt/sbtopts" |
| 8 |
+declare -r etc_sbt_opts_file="${sbt_home}/etc/sbtopts" |
8 |
+declare -r etc_sbt_opts_file="/usr/local/etc/sbt/sbtopts" |
|
|
9 |
declare -r dist_sbt_opts_file="${sbt_home}/conf/sbtopts" |
| 9 |
declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt" |
10 |
declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt" |
| 10 |
|
11 |
|
| 11 |
usage() { |
12 |
@@ -95,17 +95,17 @@ Usage: $script_name [options] |
| 12 |
@@ -99,7 +99,7 @@ Usage: $script_name [options] |
13 |
-java-home <path> alternate JAVA_HOME |
| 13 |
SBT_OPTS environment variable, if unset uses "$default_sbt_opts" |
14 |
|
| 14 |
.sbtopts if this file exists in the current directory, its contents |
15 |
# jvm options and output control |
| 15 |
are prepended to the runner args |
16 |
- JAVA_OPTS environment variable, if unset uses "$java_opts" |
|
|
17 |
- .jvmopts if this file exists in the current directory, its contents |
| 18 |
- are appended to JAVA_OPTS |
| 19 |
- SBT_OPTS environment variable, if unset uses "$default_sbt_opts" |
| 20 |
- .sbtopts if this file exists in the current directory, its contents |
| 21 |
- are prepended to the runner args |
| 16 |
- /etc/sbt/sbtopts if this file exists, it is prepended to the runner args |
22 |
- /etc/sbt/sbtopts if this file exists, it is prepended to the runner args |
| 17 |
+ ${sbt_home}/etc/sbtopts if this file exists, it is prepended to the runner args |
23 |
- -Dkey=val pass -Dkey=val directly to the java runtime |
| 18 |
-Dkey=val pass -Dkey=val directly to the java runtime |
24 |
- -J-X pass option -X directly to the java runtime |
| 19 |
-J-X pass option -X directly to the java runtime |
25 |
- (-J is stripped) |
| 20 |
(-J is stripped) |
26 |
- -S-X add -X to sbt's scalacOptions (-S is stripped) |
|
|
27 |
+ JAVA_OPTS environment variable, if unset uses "$java_opts" |
| 28 |
+ .jvmopts if this file exists in the current directory, its contents |
| 29 |
+ are appended to JAVA_OPTS |
| 30 |
+ SBT_OPTS environment variable, if unset uses "$default_sbt_opts" |
| 31 |
+ .sbtopts if this file exists in the current directory, its contents |
| 32 |
+ are prepended to the runner args |
| 33 |
+ /usr/local/etc/sbt/sbtopts if this file exists, it is prepended to the runner args |
| 34 |
+ -Dkey=val pass -Dkey=val directly to the java runtime |
| 35 |
+ -J-X pass option -X directly to the java runtime |
| 36 |
+ (-J is stripped) |
| 37 |
+ -S-X add -X to sbt's scalacOptions (-S is stripped) |
| 38 |
|
| 39 |
In the case of duplicated or conflicting options, the order above |
| 40 |
shows precedence: JAVA_OPTS lowest, command line options highest. |