From cc6c2a71bc129abb65ad13e6a9a26f3a6796a2ad Mon Sep 17 00:00:00 2001
From: Nepomuk Seiler <nepomuk.seiler@mukis.de>
Date: Sat, 10 May 2014 20:09:53 +0200
Subject: [PATCH 1/2] FIX #211 and #232. Checking $java_args[@] for memory
 settings, too.

---
 .../typesafe/sbt/packager/archetypes/bash-template  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 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
index e76bdb037..3f6eeac3e 100644
--- a/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template
+++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template
@@ -156,8 +156,16 @@ get_mem_opts () {
 
   # if we detect any of these settings in ${java_opts} we need to NOT output our settings.
   # 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 ""
+  if [[ "${java_opts}" == *-Xmx* ]] ||
+     [[ "${java_opts}" == *-Xms* ]] ||
+     [[ "${java_opts}" == *-XX:MaxPermSize* ]] ||
+     [[ "${java_opts}" == *-XX:ReservedCodeCacheSize* ]] ||
+     # check java arguments for settings, too
+     [[ "${java_args[@]}" == *-Xmx* ]] ||
+     [[ "${java_args[@]}" == *-Xms* ]] || 
+     [[ "${java_args[@]}" == *-XX:MaxPermSize* ]] || 
+     [[ "${java_args[@]}" == *-XX:ReservedCodeCacheSize* ]];
+  then
   elif [[ !$no_java_version_check ]] && [[ java_version > "1.8" ]]; then
     echo "-Xms${mem}m -Xmx${mem}m -XX:ReservedCodeCacheSize=${codecache}m"
   else 
@@ -332,6 +340,7 @@ EOM
 ###  Main script                     ###
 ###  ------------------------------- ###
 
+declare debug=0
 declare -a residual_args
 declare -a java_args
 declare -a app_commands

From 4391fbcbfa4d7bf26175ac0cd407741428bcd103 Mon Sep 17 00:00:00 2001
From: Nepomuk Seiler <nepomuk.seiler@mukis.de>
Date: Sat, 10 May 2014 20:18:58 +0200
Subject: [PATCH 2/2] Didn't ammend the last fix

---
 .../resources/com/typesafe/sbt/packager/archetypes/bash-template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template
index 3f6eeac3e..c19deb684 100644
--- a/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template
+++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template
@@ -166,6 +166,7 @@ get_mem_opts () {
      [[ "${java_args[@]}" == *-XX:MaxPermSize* ]] || 
      [[ "${java_args[@]}" == *-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