Merge pull request #3829 from cmitu/runcommand-xinit-a

runcommand: add a new launch prefix for X11 programs

Author: joolswills

scriptmodules/ports/micropolis.sh

@@ -29,16 +29,7 @@ function remove_micropolis() {
 
 function configure_micropolis() {
     local binary="/usr/games/micropolis"
-    ! isPlatform "x11" && binary="XINIT:$md_inst/micropolis.sh"
+    ! isPlatform "x11" && binary="XINIT-WM:/usr/bin/micropolis"
 
     addPort "$md_id" "micropolis" "Micropolis" "$binary"
-
-    mkdir -p "$md_inst"
-    cat >"$md_inst/micropolis.sh" << _EOF_
-#!/bin/bash
-xset -dpms s off s noblank
-matchbox-window-manager &
-/usr/games/micropolis
-_EOF_
-    chmod +x "$md_inst/micropolis.sh"
 }

scriptmodules/ports/minecraft.sh

@@ -29,13 +29,5 @@ function remove_minecraft() {
 }
 
 function configure_minecraft() {
-    addPort "$md_id" "minecraft" "Minecraft" "XINIT:$md_inst/Minecraft.sh"
-
-    cat >"$md_inst/Minecraft.sh" << _EOF_
-#!/bin/bash
-xset -dpms s off s noblank
-matchbox-window-manager &
-/usr/bin/minecraft-pi
-_EOF_
-    chmod +x "$md_inst/Minecraft.sh"
+    addPort "$md_id" "minecraft" "Minecraft" "XINIT-WM:/usr/bin/minecraft-pi"
 }

scriptmodules/supplementary/runcommand/runcommand.sh

@@ -1201,19 +1201,30 @@ 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
+    # 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
+                ;;&
+            # if it starts with XINIT-WM or XINIT-WMC (with cursor) it is an X11 application needing a window manager
+            XINIT-WM)
+                XINIT_WM=1
+                ;;
+            XINIT-WMC)
+                XINIT_WM=2
+                ;;
+        esac
     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
-    fi
 }
 
 function show_launch() {