From 2f382d09c8606af0dacd4ca19cff7ee5964017d4 Mon Sep 17 00:00:00 2001
From: Brian Long <brian@yateslong.us>
Date: Thu, 22 Apr 2021 21:57:45 -0400
Subject: [PATCH] put HotSwap/JDWP back into JAVA_OPTS

---
 docker-entrypoint.sh |  8 --------
 setenv.sh            | 10 ++++++++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 77e6d2c..e3052b9 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -6,12 +6,4 @@ JAVA_CP="${JAVA_CP}:/var/lib/jvm/dev/classes:/var/lib/jvm/dev/classes-extra1:/va
 JAVA_CP="${JAVA_CP}:/var/lib/jvm/dev/lib/*:/var/lib/jvm/dev/lib-extra1/*:/var/lib/jvm/dev/lib-extra2/*:/var/lib/jvm/dev/lib-extra3/*:/var/lib/jvm/dev/lib-extra4/*:/var/lib/jvm/dev/lib-extra5/*:/var/lib/jvm/dev/lib-extra6/*:/var/lib/jvm/dev/lib-extra7/*"
 EXEC_JAVA_OPTS="${JAVA_OPTS} -classpath ${JAVA_CP}"
 
-if [ "${ENABLE_HOTSWAP}" = "true" ]; then
-    EXEC_JAVA_OPTS="${EXEC_JAVA_OPTS} ${HOTSWAP_JAVA_OPTS}"
-fi
-
-if [ "${ENABLE_JDWP}" = "true" ]; then
-    EXEC_JAVA_OPTS="${EXEC_JAVA_OPTS} ${JDWP_JAVA_OPTS}"
-fi
-
 exec ${JAVA_HOME}/bin/java ${EXEC_JAVA_OPTS} ${JAVA_CLASS}
diff --git a/setenv.sh b/setenv.sh
index fbc1be2..581bc40 100644
--- a/setenv.sh
+++ b/setenv.sh
@@ -1,4 +1,10 @@
 #!/bin/sh
 JAVA_OPTS="${JAVA_OPTS} -Xms${JAVA_MEMORY_INIT} -Xmx${JAVA_MEMORY_MAX}"
-HOTSWAP_JAVA_OPTS="-XX:HotswapAgent=external -javaagent:/usr/local/lib/jvm/hotswap-agent.jar"
-JDWP_JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n"
+
+if [ "${ENABLE_HOTSWAP}" = "true" ]; then
+    JAVA_OPTS="${JAVA_OPTS} -XX:HotswapAgent=external -javaagent:/usr/local/lib/jvm/hotswap-agent.jar"
+fi
+
+if [ "${ENABLE_JDWP}" = "true" ]; then
+    JAVA_OPTS="${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n"
+fi