Support vmoptions syntax more fully

Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>

Author: mgaffigan

docker/mirth-connect.sh

@@ -2,16 +2,26 @@
 
 # Mirth Connect Server Launcher Script
 
-# Get the directory where this script is located
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+APP_ARGS=("$@")
 
 # Set MIRTH_HOME to the script directory
-export MIRTH_HOME="$SCRIPT_DIR"
+MIRTH_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+CLASSPATH="$MIRTH_HOME/mirth-server-launcher.jar"
+VMOPTIONS=()
+
+# Default JAVA_PATH based on env, JAVA_HOME, or "java"
+if [[ -n "$JAVA_PATH" ]]; then
+    JAVA_PATH="$JAVA_PATH"
+elif [[ -n "$JAVA_HOME" && -x "$JAVA_HOME/bin/java" ]]; then
+    JAVA_PATH="$JAVA_HOME/bin/java"
+else
+    # Default to "java" if no other options are available
+    JAVA_PATH="java"
+fi
 
 # Set Java options
 parse_vmoptions() {
     local file="$1"
-    local current_options="${2:-}" # Initialize with existing options, or empty
 
     if [[ ! -f "$file" ]]; then
         echo "Error: VM options file not found: $file" >&2
@@ -28,6 +38,13 @@ parse_vmoptions() {
             continue
         fi
 
+        # Evaluate environment variables to be their actual values
+        # Question: Is this a security risk?
+        # Answer: No: vmoptions is trusted. We allow replacing JAVA_PATH and 
+        #         CLASSPATH, so there is a by-design ability for someone with
+        #         write privileges to the vmoptions to execute arbitrary code.
+        line=$(eval echo "$line")
+        
         # Check for -include-options directive
         if [[ "$line" =~ ^-include-options[[:space:]]+(.+) ]]; then
             local included_file="${BASH_REMATCH[1]}"
@@ -38,27 +55,39 @@ parse_vmoptions() {
             fi
 
             # Recursively call parse_vmoptions for the included file
-            local included_opts
-            if ! included_opts=$(parse_vmoptions "$included_file" "$current_options"); then
-                echo "Error processing included options from $included_file" >&2
-                return 1
-            fi
-            current_options="$included_opts"
+            parse_vmoptions "$included_file"
+        elif [[ "$line" =~ ^-classpath[[:space:]]+(.+) ]]; then
+            # Handle -classpath directive
+            CLASSPATH="${BASH_REMATCH[1]}"
+        elif [[ "$line" =~ ^-classpath/a[[:space:]]+(.+) ]]; then
+            # Handle -classpath/a directive (append to existing classpath)
+            CLASSPATH="${CLASSPATH}:${BASH_REMATCH[1]}"
+        elif [[ "$line" =~ ^-classpath/p[[:space:]]+(.+) ]]; then
+            # Handle -classpath/p directive (prepend to existing classpath)
+            CLASSPATH="${BASH_REMATCH[1]}:${CLASSPATH}"
+        elif [[ "$line" =~ ^-java-cmd[[:space:]]+(.+) ]]; then
+            # Handle -java-cmd directive (set JAVA_PATH)
+            JAVA_PATH="${BASH_REMATCH[1]}"
         else
             # Add the option to the accumulated string
-            current_options+="${current_options:+" "}$line"
+            VMOPTIONS+=("$line")
         fi
     done < "$file"
 
-    echo "$current_options"
     return 0
 }
-JAVA_OPTS=$(parse_vmoptions "oieserver.vmoptions")
-JAVA_OPTS="$JAVA_OPTS -Dmirth.home=$MIRTH_HOME"
 
-# Launch Mirth Connect
-echo "Starting Mirth Connect..."
-echo "MIRTH_HOME: $MIRTH_HOME"
-echo "JAVA_OPTS: $JAVA_OPTS"
+# Recursively parse the VM options file
+parse_vmoptions "$MIRTH_HOME/oieserver.vmoptions"
 
-java $JAVA_OPTS -jar "$MIRTH_HOME/mirth-server-launcher.jar"
+JAVA_OPTS=("${VMOPTIONS[@]}" 
+           "-cp" "$CLASSPATH" 
+           "com.mirth.connect.server.launcher.MirthLauncher" 
+           "${APP_ARGS[@]}")
+
+# Launch Mirth Connect (as this PID with exec)
+echo "Starting Mirth Connect..."
+# This doesn't include quotes, which could be confusing. Not sure if there's a
+# better way to do this.
+echo "$JAVA_PATH ${JAVA_OPTS[*]}"
+exec "$JAVA_PATH" "${JAVA_OPTS[@]}"