Merge pull request #204 from sbt/wip/java8-script-warnings

FIX #203 Adding check for java 8
sbt · Mar 30, 2014 · 8b7882e · 8b7882e
2 parents 55541a7 + daad0bb
commit 8b7882e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template
@@ -158,6 +158,8 @@ get_mem_opts () {
   # The reason is the Xms/Xmx, if they don't line up, cause errors.
   if [[ "${java_opts}" == *-Xmx* ]] || [[ "${java_opts}" == *-Xms* ]] || [[ "${java_opts}" == *-XX:MaxPermSize* ]] || [[ "${java_opts}" == *-XX:ReservedCodeCacheSize* ]]; then
      echo ""
+  elif [[ !$no_java_version_check ]] && [[ java_version > "1.8" ]]; then
+    echo "-Xms${mem}m -Xmx${mem}m -XX:ReservedCodeCacheSize=${codecache}m"
   else 
     echo "-Xms${mem}m -Xmx${mem}m -XX:MaxPermSize=${perm}m -XX:ReservedCodeCacheSize=${codecache}m"
   fi