Merge pull request #432 from LizardByte/update/flatpak-apps-config-file

update apps.json

packaging/linux/flatpak/dev.lizardbyte.sunshine.yml

@@ -200,3 +200,11 @@ modules:
         url: '@GITHUB_CLONE_URL@'
         branch: '@GITHUB_BRANCH@'
         commit: '@GITHUB_COMMIT@'
+    post-install:
+      # use `sed` to update apps.json with prefixes required for flatpak
+      # -r (regex)
+      # -z (handle new lines) https://linuxhint.com/sed-replace-newline-with-space
+      # `/gm` global and multiline
+      - sed -r -z -i -e
+        's/("((do)|(undo)|(cmd)|(detached))"\s*:\s*\[?\n*\s*")(.*")/\1flatpak-spawn --host \7/gm'
+        /app/share/sunshine/apps.json

src_assets/linux/assets/apps.json

@@ -1,20 +1,24 @@
 {
-	"env":{ 
+  "env": {
-		"PATH":"$(PATH):$(HOME)/.local/bin"
+    "PATH": "$(PATH):$(HOME)/.local/bin"
-	},
+  },
-	"apps":[
+  "apps": [
-	{
+    {
-		"name":"Low Res Desktop",
+      "name": "Low Res Desktop",
-		"prep-cmd":[
+      "prep-cmd": [
-		{ "do":"xrandr --output HDMI-1 --mode 1920x1080", "undo":"xrandr --output HDMI-1 --mode 1920x1200" }
+        {
-		]
+          "do": "xrandr --output HDMI-1 --mode 1920x1080",
-	},
+          "undo": "xrandr --output HDMI-1 --mode 1920x1200"
-	{
+        }
-		"name":"Steam BigPicture",
+      ]
-
+    },
-		"output":"steam.txt",
+    {
-		"detached":["setsid steam steam://open/bigpicture"],
+      "name": "Steam BigPicture",
-		"image-path":"steam.png"
+      "output": "steam.txt",
-	}
+      "detached": [
-	]
+        "setsid steam steam://open/bigpicture"
+      ],
+      "image-path": "steam.png"
+    }
+  ]
 }

src_assets/macos/assets/apps.json

@@ -1,6 +1,6 @@
 {
-	"env":{
+  "env": {
-		"PATH":"$(PATH):$(HOME)/.local/bin"
+    "PATH": "$(PATH):$(HOME)/.local/bin"
-	},
+  },
-	"apps":[ ]
+  "apps": []
 }

src_assets/windows/assets/apps.json

@@ -1,14 +1,15 @@
 {
-	"env":{
+  "env": {
-		"PATH":"$(PATH);C:\\Program Files (x86)\\Steam"
+    "PATH": "$(PATH);C:\\Program Files (x86)\\Steam"
-	},
+  },
-	"apps":[
+  "apps": [
-	{
+    {
-		"name":"Steam BigPicture",
+      "name": "Steam BigPicture",
-
+      "output": "steam.txt",
-		"output":"steam.txt",
+      "detached": [
-		"detached":["steam steam://open/bigpicture"],
+        "steam steam://open/bigpicture"
-		"image-path":"steam.png"
+      ],
-	}
+      "image-path": "steam.png"
-	]
+    }
+  ]
 }