runcommand - rework parsing of CON: and XINIT: commandline options.

Author: joolswills

scriptmodules/supplementary/runcommand/runcommand.sh

@@ -1201,18 +1201,21 @@ function get_sys_command() {
     quake_dir="${quake_dir%/*}"
     COMMAND="${COMMAND//\%QUAKEDIR\%/\"$quake_dir\"}"
 
-    # if it starts with CON: it is a console application (so we don't redirect stdout later)
-    if [[ "$COMMAND" == CON:* ]]; then
-        # remove CON:
-        COMMAND="${COMMAND:4}"
-        CONSOLE_OUT=1
-    fi
-
-    # if it starts with XINIT: it is an X11 application (so we need to launch via xinit)
-    if [[ "$COMMAND" == XINIT:* ]]; then
-        # remove XINIT:
-        COMMAND="${COMMAND:6}"
-        XINIT=1
+    # check if COMMAND starts with a launch OPTION:
+    if [[ "$COMMAND" =~ ^([A-Z\-]+?):(.*)$ ]]; then
+        # extract the command
+        COMMAND="${BASH_REMATCH[2]}"
+
+        case "${BASH_REMATCH[1]}" in
+            # if it starts with CON: it is a console application (so we don't redirect stdout later)
+            CON)
+                CONSOLE_OUT=1
+                ;;
+            # if it starts with XINIT: it is an X11 application (so we need to launch via xinit)
+            XINIT*)
+                XINIT=1
+                ;;
+        esac
     fi
 }