Translate JAVA_OPTS into JVM_OPTS (preferred).

heroku · Feb 3, 2012 · 0ee59f1 · 0ee59f1
1 parent 1bbcf78
commit 0ee59f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/bin/release b/bin/release
@@ -5,7 +5,7 @@ cat <<EOF
 ---
 config_vars:
   PATH: .lein/bin:/usr/local/bin:/usr/bin:/bin
-  JAVA_OPTS: -Xmx400m
+  JVM_OPTS: -Xmx400m
   LEIN_NO_DEV: yes
 default_process_types:
   web: lein run

diff --git a/opt/lein b/opt/lein
@@ -10,6 +10,9 @@ fi
 LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Duser.home=$HOME -Dleiningen.original.pwd=$PWD"
 LEIN_JAR=".lein/leiningen-$LEIN_VERSION-standalone.jar"
 
+# Prefer JVM_OPTS, but fall back to JAVA_OPTS for compatibility
+export JVM_OPTS="${JVM_OPTS:-"$JAVA_OPTS"}"
+
 if [ "$1" == "repl" ]; then
   CLASSPATH=$(lein classpath)
   if [ "$COLUMNS" != "" -a "$LINES" != "" ]; then