summaryrefslogtreecommitdiff
path: root/devel/sbt/files/patch-bin_sbt
blob: eacecfefbbd3fe11c28d4cf4fc35963c77c477c4 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
--- bin/sbt.orig	2013-08-28 10:14:39.000000000 +0200
+++ bin/sbt	2013-08-28 10:16:02.000000000 +0200
@@ -63,7 +63,7 @@
 
 declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
 declare -r sbt_opts_file=".sbtopts"
-declare -r etc_sbt_opts_file="${sbt_home}/conf/sbtopts"
+declare -r etc_sbt_opts_file="${sbt_home}/etc/sbtopts"
 declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt"
 
 usage() {
@@ -98,7 +98,7 @@
   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
+  ${sbt_home}/etc/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)