Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Split liftsh options, modifying LIFTSH_OPTS is safer now. You can now…

… do:

LIFTSH_OPTS="-Dpublish.remote=true -Xmx3g" ./liftsh clean-plugins reload update publish
  • Loading branch information...
commit f917c8e4b2b7d28f92c0071317133172a8bd5e30 1 parent cbebcea
@indrajitr indrajitr authored
Showing with 14 additions and 5 deletions.
  1. +7 −3 liftsh
  2. +7 −2 liftsh.cmd
View
10 liftsh
@@ -5,7 +5,11 @@ if test -f ~/.liftsh.config; then
. ~/.liftsh.config
fi
-# Default option if nothing is specified
-DEFAULT_OPTS="-Dfile.encoding=UTF-8 -Xss8M -Xmx1G -noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512M -Dfile.encoding=utf8 -Dsbt.intransitive=true"
+# Internal options, always specified
+INTERNAL_OPTS="-Dfile.encoding=UTF-8 -Xss8M -Xmx1G -noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512M"
-exec java ${LIFTSH_OPTS:-${DEFAULT_OPTS}} -jar `dirname $0`/project/sbt-launch-0.7.5.RC0.jar "$@"
+# Default options, if nothing is specified
+DEFAULT_OPTS="-Dsbt.intransitive=true"
+
+# Call with INTERNAL_OPTS followed by LIFTSH_OPTS (or DEFAULT_OPTS). java aways takes the last option when duplicate.
+exec java ${INTERNAL_OPTS} ${LIFTSH_OPTS:-${DEFAULT_OPTS}} -jar `dirname $0`/project/sbt-launch-0.7.5.RC0.jar "$@"
View
9 liftsh.cmd
@@ -1,9 +1,14 @@
@echo off
-set DEFAULT_OPTS="-Dfile.encoding=UTF-8 -Xss8M -Xmx1G -noverify -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M -Dfile.encoding=utf8 -Dsbt.intransitive=true"
+@REM Internal options, always specified
+set INTERNAL_OPTS="-Dfile.encoding=UTF-8 -Xss8M -Xmx1G -noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512M"
+
+@REM Default options, if nothing is specified
+set DEFAULT_OPTS="-Dsbt.intransitive=true"
if "%LIFTSH_OPTS%"=="" (
set LIFTSH_OPTS=DEFAULT_OPTS
)
-java "%LIFTSH_OPTS%" -jar "%~dp0\project\sbt-launch-0.7.5.RC0.jar" %*
+@REM Call with INTERNAL_OPTS followed by LIFTSH_OPTS (or DEFAULT_OPTS). java aways takes the last option when duplicate.
+java %INTERNAL_OPTS% %LIFTSH_OPTS% -jar "%~dp0\project\sbt-launch-0.7.5.RC0.jar" %*
Please sign in to comment.
Something went wrong with that request. Please try again.